Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge-recursive: avoid incorporating uncommitted changes in a merge | Elijah Newren | 2017-12-22 | 1 | -1/+1 |
* | t6044: recursive can silently incorporate dirty changes in a merge | Elijah Newren | 2017-12-22 | 1 | -5/+21 |
* | Merge branch 'js/t6044-use-test-seq' | Junio C Hamano | 2016-05-29 | 1 | -2/+2 |
|\ | |||||
| * | t6044: replace seq by test_seqjs/t6044-use-test-seq | Johannes Sixt | 2016-05-18 | 1 | -2/+2 |
* | | merge-octopus: abort if index does not match HEADen/merge-octopus-fix | Elijah Newren | 2016-04-12 | 1 | -3/+3 |
|/ | |||||
* | t6044: new merge testcases for when index doesn't match HEAD | Elijah Newren | 2016-04-12 | 1 | -0/+153 |