summaryrefslogtreecommitdiff
path: root/merge-cache.c
Commit message (Expand)AuthorAgeFilesLines
* [PATCH] cleanup of in-code namesAlexey Nezhdanov2005-05-191-4/+4
* git-merge-cache -o does all the automerges in a single shotPetr Baudis2005-05-111-5/+15
* Make merge-cache not fail immediatelly when the merge programPetr Baudis2005-05-071-1/+4
* [PATCH] make file merging respect permissionsJames Bottomley2005-04-231-1/+10
* Change merge-cache and git-merge-one-file to use the SHA1 of the fileLinus Torvalds2005-04-181-24/+3
* Ass a "merge-cache" helper program to execute a merge onLinus Torvalds2005-04-171-0/+127