path: root/merge-cache.c
AgeCommit message (Collapse)Author
2005-09-08Big tool rename.Junio C Hamano
As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano <>
2005-08-05[PATCH] Fix git-merge-cache -qPetr Baudis
I'm totally stupid and got it backwards, sorry about that. git-merge-cache -q would mean it's noisy and quiet without any parameters. Signed-off-by: Petr Baudis <> Signed-off-by: Junio C Hamano <>
2005-08-01[PATCH] git-merge-cache -q doesn't complain about failing merge programPetr Baudis
git-merge-cache reporting failed merge program is undesirable for Cogito, since it emits its own more appropriate error message in that case. However, I want to show other possible git-merge-cache error messages. So -q will just silence this particular error. Signed-off-by: Petr Baudis <> Signed-off-by: Junio C Hamano <>
2005-05-19[PATCH] cleanup of in-code namesAlexey Nezhdanov
Fixes all in-code names that leaved during "big name change". Signed-off-by: Alexey Nezhdanov <> Signed-off-by: Linus Torvalds <>
2005-05-11git-merge-cache -o does all the automerges in a single shotPetr Baudis
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.
2005-05-07Make merge-cache not fail immediatelly when the merge programPetr Baudis
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.
2005-04-24[PATCH] make file merging respect permissionsJames Bottomley
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 <> Signed-off-by: Linus Torvalds <>
2005-04-18Change merge-cache and git-merge-one-file to use the SHA1 of the fileLinus Torvalds
instead of a checked-out temporary copy. If merging requires a checked-out-copy, we now do so with "unpack-file".
2005-04-18Ass a "merge-cache" helper program to execute a merge onLinus Torvalds
any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.