aboutsummaryrefslogtreecommitdiff
path: root/merge-cache.c
Commit message (Expand)AuthorAge
* Big tool rename.Junio C Hamano2005-09-07
* [PATCH] Fix git-merge-cache -qPetr Baudis2005-08-05
* [PATCH] git-merge-cache -q doesn't complain about failing merge programPetr Baudis2005-08-01
* [PATCH] cleanup of in-code namesAlexey Nezhdanov2005-05-19
* git-merge-cache -o does all the automerges in a single shotPetr Baudis2005-05-11
* Make merge-cache not fail immediatelly when the merge programPetr Baudis2005-05-07
* [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