Andrew's git / gitweb.git / diff
?
Merge branch 'ew/rebase'
authorJunio C Hamano <junkio@cox.net>
Thu, 22 Jun 2006 17:34:02 +0000 (10:34 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 22 Jun 2006 17:34:02 +0000 (10:34 -0700)
* ew/rebase:
rebase --merge: fix for rebasing more than 7 commits.
rebase: error out for NO_PYTHON if they use recursive merge
Add renaming-rebase test.
rebase: Allow merge strategies to be used when rebasing

Trivial merge