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