| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | t7606: Avoid using head as a file name | Brian Gernhardt | 2010-08-24 |
| * | merge: let custom strategies intervene in trivial merges | Jonathan Nieder | 2010-08-15 |
| * | t7606 (merge-theirs): modernize style | Jonathan Nieder | 2010-08-15 |
| * | tests: use "git foo" without dash in strings | Nanako Shiraishi | 2008-09-09 |
| * | t7606: fix custom merge test | Junio C Hamano | 2008-08-23 |
| * | Add a new test for using a custom merge strategy | Miklos Vajna | 2008-07-29 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |