From: Junio C Hamano <junkio@cox.net>
Date: Thu, 22 Jun 2006 17:34:02 +0000 (-0700)
Subject: Merge branch 'ew/rebase'
X-Git-Tag: v1.4.1-rc1^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c5c23745d8d6eb0504a16851b9b080ec3ded94f9;p=git.git

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
---

c5c23745d8d6eb0504a16851b9b080ec3ded94f9