kernel/git - git - PowerEL Git System

Tree: 9d73fad4ca

Author	SHA1	Message	Date
Alexey Nezhdanov	667bb59b2d	[PATCH] cleanup of in-code names Fixes all in-code names that leaved during "big name change". Signed-off-by: Alexey Nezhdanov <snake@penza-gsm.ru> Signed-off-by: Linus Torvalds <torvalds@osdl.org>	20 years ago
Petr Baudis	2a45925180	git-merge-cache -o does all the automerges in a single shot When you pass git-merge-cache the -o option, it tries to do all the automatic merges and possibly return error if any of them failed, instead of the default behaviour of failing immediately after the first failed automatic merge. Ported from the Cogito branch - Cogito needs this behaviour.	20 years ago
Petr Baudis	8c59926f5e	Make merge-cache not fail immediatelly when the merge program fails, but go on and return error code at the end. It makes sense to try to merge everything, then let the user solve the commits at once.	20 years ago
James Bottomley	e2b6a9d0bf	[PATCH] make file merging respect permissions 1) permissions aren't respected in the merge script (primarily because they're never passed in to it in the first place). Fix that and also check for permission conflicts in the merge 2) the delete of a file in both branches may indeed be just that, but it could also be the indicator of a rename conflict (file moved to different locations in both branches), so error out and ask the committer for guidance. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>	20 years ago
Linus Torvalds	e3b4be7f6c	Change merge-cache and git-merge-one-file to use the SHA1 of the file instead of a checked-out temporary copy. If merging requires a checked-out-copy, we now do so with "unpack-file".	20 years ago
Linus Torvalds	75118b13bc	Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.	20 years ago