Merge branch 'ew/rebase'
commitc5c23745d8d6eb0504a16851b9b080ec3ded94f9
authorJunio C Hamano <junkio@cox.net>
Thu, 22 Jun 2006 17:34:02 +0000 (22 10:34 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 22 Jun 2006 17:34:02 +0000 (22 10:34 -0700)
treedc33066ecc7196f86129447c1e1b17f2740df4dd
parentc3e160886214c3e7d1e939918900c56e0d1aca56
parent5887ac821f9df614cfcf3349960523e1c36f2de7
Merge branch 'ew/rebase'

* 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