summaryrefslogtreecommitdiff
path: root/merge-cache.c
AgeCommit message (Expand)AuthorFilesLines
2005-04-23[PATCH] make file merging respect permissionsLibravatar James Bottomley1-1/+10
2005-04-18Change merge-cache and git-merge-one-file to use the SHA1 of the fileLibravatar Linus Torvalds1-24/+3
2005-04-17Ass a "merge-cache" helper program to execute a merge onLibravatar Linus Torvalds1-0/+127