| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2016-03-23 | merge: refuse to create too cool a merge by default |  Junio C Hamano | 1 | -1/+2 |
| 2015-06-24 | Merge branch 'jc/ll-merge-expose-path' | Junio C Hamano | 1 | -5/+9 |
| 2015-06-04 | ll-merge: pass the original path to external drivers | Junio C Hamano | 1 | -5/+9 |
| 2015-03-25 | t: fix some trivial cases of ignored exit codes in loops |  Jeff King | 1 | -3/+3 |
| 2010-01-20 | conflict-marker-size: add test and docs | Junio C Hamano | 1 | -0/+12 |
| 2008-09-25 | Merge branch 'mv/merge-recursive' |  Shawn O. Pearce | 1 | -0/+22 |
| 2008-09-06 | builtin-merge: release the lockfile in try_merge_strategy() |  Miklos Vajna | 1 | -0/+22 |
| 2008-09-03 | tests: use "git xyzzy" form (t3600 - t6999) |  Nanako Shiraishi | 1 | -6/+6 |
| 2007-04-18 | Custom low-level merge driver: change the configuration scheme. |  Junio C Hamano | 1 | -2/+6 |
| 2007-04-18 | Custom low-level merge driver support. | Junio C Hamano | 1 | -1/+70 |
| 2007-04-17 | Add a demonstration/test of customized merge. | Junio C Hamano | 1 | -0/+72 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |