path: root/merge-cache.c
AgeCommit message (Expand)Author
2005-05-19[PATCH] cleanup of in-code namesAlexey Nezhdanov
2005-05-11git-merge-cache -o does all the automerges in a single shotPetr Baudis
2005-05-07Make merge-cache not fail immediatelly when the merge programPetr Baudis
2005-04-24[PATCH] make file merging respect permissionsJames Bottomley
2005-04-18Change merge-cache and git-merge-one-file to use the SHA1 of the fileLinus Torvalds
2005-04-18Ass a "merge-cache" helper program to execute a merge onLinus Torvalds