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