summaryrefslogtreecommitdiff
path: root/t/t7602-merge-octopus-many.sh
Commit message (Expand)AuthorAgeFilesLines
* diff --stat: use less columns for change countsZbigniew Jędrzejewski-Szmek2012-04-301-6/+6
* Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano2012-04-271-5/+3
|\
| * builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-171-1/+1
| * merge tests: octopus with redundant parentsMichał Kiedrowicz2012-04-171-6/+4
* | test: use test_i18ncmp when checking --stat outputJonathan Nieder2012-03-131-3/+3
|/
* Use correct grammar in diffstat summary linend/diffstat-gramnumNguyễn Thái Ngọc Duy2012-02-031-3/+3
* merge: reword the final messageJunio C Hamano2011-05-251-3/+3
* tests: add missing &&Jonathan Nieder2010-11-091-1/+1
* octopus: reenable fast-forward mergesStephen Boyd2009-12-131-0/+18
* octopus: make merge process simpler to followStephen Boyd2009-12-131-0/+33
* tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-031-1/+1
* Build in mergeMiklos Vajna2008-07-071-1/+1
* Add new test to ensure git-merge handles more than 25 refs.Miklos Vajna2008-06-301-0/+52