Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2005-05-11 | git-merge-cache -o does all the automerges in a single shot | Petr Baudis | 1 | -5/+15 |
2005-05-07 | Make merge-cache not fail immediatelly when the merge program | Petr Baudis | 1 | -1/+4 |
2005-04-23 | [PATCH] make file merging respect permissions | James Bottomley | 1 | -1/+10 |
2005-04-18 | Change merge-cache and git-merge-one-file to use the SHA1 of the file | Linus Torvalds | 1 | -24/+3 |
2005-04-17 | Ass a "merge-cache" helper program to execute a merge on | Linus Torvalds | 1 | -0/+127 |