| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2010-11-29 | Merge branch 'en/merge-recursive' |  Junio C Hamano | 1 | -3/+182 |
| 2010-11-09 | tests: add missing && |  Jonathan Nieder | 1 | -1/+1 |
| 2010-09-29 | merge-recursive: Avoid doubly merging rename/add conflict contents |  Elijah Newren | 1 | -2/+2 |
| 2010-09-29 | t6036: Add testcase for undetected conflict | Elijah Newren | 1 | -0/+85 |
| 2010-09-29 | t6036: Add a second testcase similar to the first but with content changes | Elijah Newren | 1 | -0/+76 |
| 2010-09-29 | t6036: Test index and worktree state, not just that merge fails | Elijah Newren | 1 | -3/+21 |
| 2009-07-30 | merge-recursive: don't segfault while handling rename clashes | Junio C Hamano | 1 | -0/+55 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |