summaryrefslogtreecommitdiffstats
path: root/t/t7603-merge-reduce-heads.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* merge: free result of repo_get_merge_bases()Jeff King2023-10-031-0/+1
* t6000-t9999: detect and signal failure within loopEric Sunshine2021-12-131-2/+2
* pull: abort by default when fast-forwarding is not possibleElijah Newren2021-07-221-1/+1
* fmt-merge-msg: discard needless merge parentsJunio C Hamano2012-04-191-1/+30
* builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-181-1/+1
* merge tests: octopus with redundant parentsMichaƂ Kiedrowicz2012-04-181-0/+19
* t7603: add new testcases to ensure builtin-commit uses reduce_heads()Miklos Vajna2008-09-111-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-07-011-0/+63