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