aboutsummaryrefslogtreecommitdiff
path: root/merge-cache.c
Commit message (Expand)AuthorAge
* [PATCH] make file merging respect permissionsJames Bottomley2005-04-23
* Change merge-cache and git-merge-one-file to use the SHA1 of the fileLinus Torvalds2005-04-18
* Ass a "merge-cache" helper program to execute a merge onLinus Torvalds2005-04-17