Age | Commit message (Expand) | Author | Files | Lines |
2016-04-24 | git-rebase--merge: don't include absent parent as a base | Ben Woosley | 1 | -0/+9 |
2015-04-29 | merge: deprecate 'git merge <message> HEAD <commit>' syntax | Junio C Hamano | 1 | -1/+1 |
2014-06-16 | rebase--merge: fix --skip with two conflicts in a row | brian m. carlson | 1 | -0/+15 |
2010-11-11 | t3402: test "rebase -s<strategy> -X<opt>" | Junio C Hamano | 1 | -0/+21 |
2010-08-03 | rebase: support -X to pass through strategy options | Mike Lundy | 1 | -0/+9 |
2007-11-09 | rebase: operate on a detached HEAD | Johannes Schindelin | 1 | -1/+6 |
2006-10-27 | tests: merge-recursive is usable without Python | Junio C Hamano | 1 | -6/+0 |
2006-06-21 | rebase: error out for NO_PYTHON if they use recursive merge | Eric Wong | 1 | -0/+6 |
2006-06-21 | Add renaming-rebase test. | Junio C Hamano | 1 | -0/+106 |