| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | t/t7602-merge-octopus-many.sh: use the $( ... ) construct for command substit... | Elia Pinto | 2016-01-08 | 1 | -4/+4 |
| * | diff --stat: use less columns for change counts | Zbigniew Jędrzejewski-Szmek | 2012-04-30 | 1 | -6/+6 |
| * | Merge branch 'jc/merge-reduce-parents-early' | Junio C Hamano | 2012-04-27 | 1 | -5/+3 |
| |\ |
|
| | * | builtin/merge.c: reduce parents early | Junio C Hamano | 2012-04-17 | 1 | -1/+1 |
| | * | merge tests: octopus with redundant parents | Michał Kiedrowicz | 2012-04-17 | 1 | -6/+4 |
| * | | test: use test_i18ncmp when checking --stat output | Jonathan Nieder | 2012-03-13 | 1 | -3/+3 |
| |/ |
|
| * | Use correct grammar in diffstat summary linend/diffstat-gramnum | Nguyễn Thái Ngọc Duy | 2012-02-03 | 1 | -3/+3 |
| * | merge: reword the final message | Junio C Hamano | 2011-05-25 | 1 | -3/+3 |
| * | tests: add missing && | Jonathan Nieder | 2010-11-09 | 1 | -1/+1 |
| * | octopus: reenable fast-forward merges | Stephen Boyd | 2009-12-13 | 1 | -0/+18 |
| * | octopus: make merge process simpler to follow | Stephen Boyd | 2009-12-13 | 1 | -0/+33 |
| * | tests: use "git xyzzy" form (t7200 - t9001) | Nanako Shiraishi | 2008-09-03 | 1 | -1/+1 |
| * | Build in merge | Miklos Vajna | 2008-07-07 | 1 | -1/+1 |
| * | Add new test to ensure git-merge handles more than 25 refs. | Miklos Vajna | 2008-06-30 | 1 | -0/+52 |
