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