summaryrefslogtreecommitdiff
path: root/t/t7603-merge-reduce-heads.sh
AgeCommit message (Expand)AuthorFilesLines
2021-07-22pull: abort by default when fast-forwarding is not possibleLibravatar Elijah Newren1-1/+1
2012-04-18fmt-merge-msg: discard needless merge parentsLibravatar Junio C Hamano1-1/+30
2012-04-17builtin/merge.c: reduce parents earlyLibravatar Junio C Hamano1-1/+1
2012-04-17merge tests: octopus with redundant parentsLibravatar MichaƂ Kiedrowicz1-0/+19
2008-09-10t7603: add new testcases to ensure builtin-commit uses reduce_heads()Libravatar Miklos Vajna1-0/+53
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Libravatar Nanako Shiraishi1-1/+1
2008-06-30Add new test case to ensure git-merge reduces octopus parents when possibleLibravatar Miklos Vajna1-0/+63