summaryrefslogtreecommitdiffstats
path: root/merge-cache.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* [PATCH] make file merging respect permissionsJames Bottomley2005-04-241-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-181-0/+127