aboutsummaryrefslogtreecommitdiffstats
path: root/merge-cache.c
AgeCommit message (Expand)AuthorFilesLines
2005-05-19[PATCH] cleanup of in-code namesAlexey Nezhdanov1-4/+4
2005-05-11git-merge-cache -o does all the automerges in a single shotPetr Baudis1-5/+15
2005-05-07Make merge-cache not fail immediatelly when the merge programPetr Baudis1-1/+4
2005-04-23[PATCH] make file merging respect permissionsJames Bottomley1-1/+10
2005-04-18Change merge-cache and git-merge-one-file to use the SHA1 of the fileLinus Torvalds1-24/+3
2005-04-17Ass a "merge-cache" helper program to execute a merge onLinus Torvalds1-0/+127