Age | Commit message (Expand) | Author | Files | Lines |
2018-07-11 | merge-recursive: enforce rule that index matches head before merging | Elijah Newren | 1 | -11/+8 |
2018-07-11 | t6044: add more testcases with staged changes before a merge is invoked | Elijah Newren | 1 | -0/+29 |
2018-07-11 | merge-recursive: fix assumption that head tree being merged is HEAD | Elijah Newren | 1 | -1/+1 |
2018-07-11 | merge-recursive: make sure when we say we abort that we actually abort | Elijah Newren | 1 | -1/+1 |
2018-07-11 | t6044: add a testcase for index matching head, when head doesn't match HEAD | Elijah Newren | 1 | -0/+11 |
2018-07-03 | t6044: verify that merges expected to abort actually abort | Elijah Newren | 1 | -11/+21 |
2017-12-22 | merge-recursive: avoid incorporating uncommitted changes in a merge | Elijah Newren | 1 | -1/+1 |
2017-12-22 | t6044: recursive can silently incorporate dirty changes in a merge | Elijah Newren | 1 | -5/+21 |
2016-05-29 | Merge branch 'js/t6044-use-test-seq' | Junio C Hamano | 1 | -2/+2 |
2016-05-18 | t6044: replace seq by test_seq | Johannes Sixt | 1 | -2/+2 |
2016-04-12 | t6044: new merge testcases for when index doesn't match HEAD | Elijah Newren | 1 | -0/+153 |
2016-04-12 | merge-octopus: abort if index does not match HEAD | Elijah Newren | 1 | -3/+3 |