Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
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 |