| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2010-06-11 | merge-recursive: demonstrate an incorrect conflict with submodule |  Johannes Sixt | 1 | -0/+29 |
| 2010-01-12 | Be more user-friendly when refusing to do something because of conflict. |  Matthieu Moy | 1 | -2/+4 |
| 2009-06-01 | refuse to merge during a merge |  Clemens Buchacher | 1 | -0/+3 |
| 2008-09-26 | Remove empty directories in recursive merge |  Alex Riesen | 1 | -0/+11 |
| 2008-09-03 | tests: use "git xyzzy" form (t0000 - t3599) |  Nanako Shiraishi | 1 | -7/+7 |
| 2008-08-23 | merge: fix numerus bugs around "trivial merge" area |  Junio C Hamano | 1 | -0/+11 |
| 2008-05-24 | tests: do not use implicit "git diff --no-index" | Junio C Hamano | 1 | -21/+21 |
| 2007-06-07 | War on whitespace | Junio C Hamano | 1 | -1/+0 |
| 2007-04-19 | Remove case-sensitive file in t3030-merge-recursive. |  Brian Gernhardt | 1 | -52/+52 |
| 2007-04-10 | t3030: merge-recursive backend test. |  Junio C Hamano | 1 | -0/+528 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |