summaryrefslogtreecommitdiff
path: root/t/t7602-merge-octopus-many.sh
AgeCommit message (Expand)AuthorFilesLines
2016-01-08t/t7602-merge-octopus-many.sh: use the $( ... ) construct for command substit...Libravatar Elia Pinto1-4/+4
2012-04-30diff --stat: use less columns for change countsLibravatar Zbigniew Jędrzejewski-Szmek1-6/+6
2012-04-27Merge branch 'jc/merge-reduce-parents-early'Libravatar Junio C Hamano1-5/+3
2012-04-17builtin/merge.c: reduce parents earlyLibravatar Junio C Hamano1-1/+1
2012-04-17merge tests: octopus with redundant parentsLibravatar Michał Kiedrowicz1-6/+4
2012-03-13test: use test_i18ncmp when checking --stat outputLibravatar Jonathan Nieder1-3/+3
2012-02-03Use correct grammar in diffstat summary lineLibravatar Nguyễn Thái Ngọc Duy1-3/+3
2011-05-25merge: reword the final messageLibravatar Junio C Hamano1-3/+3
2010-11-09tests: add missing &&Libravatar Jonathan Nieder1-1/+1
2009-12-13octopus: reenable fast-forward mergesLibravatar Stephen Boyd1-0/+18
2009-12-13octopus: make merge process simpler to followLibravatar Stephen Boyd1-0/+33
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Libravatar Nanako Shiraishi1-1/+1
2008-07-07Build in mergeLibravatar Miklos Vajna1-1/+1
2008-06-30Add new test to ensure git-merge handles more than 25 refs.Libravatar Miklos Vajna1-0/+52