summaryrefslogtreecommitdiff
path: root/t/t7603-merge-reduce-heads.sh
Commit message (Expand)AuthorAgeFilesLines
* fmt-merge-msg: discard needless merge parentsJunio C Hamano2012-04-181-1/+30
* builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-171-1/+1
* merge tests: octopus with redundant parentsMichaƂ Kiedrowicz2012-04-171-0/+19
* t7603: add new testcases to ensure builtin-commit uses reduce_heads()Miklos Vajna2008-09-101-0/+53
* tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-031-1/+1
* Add new test case to ensure git-merge reduces octopus parents when possibleMiklos Vajna2008-06-301-0/+63