From: Junio C Hamano <junkio@cox.net>
Date: Wed, 21 Jun 2006 10:56:41 +0000 (-0700)
Subject: Merge branch 'ew/rebase' into next
X-Git-Tag: v1.4.1-rc1~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=160a59f326d55970f8a038ef635c662b9c648c75;p=git.git

Merge branch 'ew/rebase' into next

* ew/rebase:
  rebase: error out for NO_PYTHON if they use recursive merge
  Add renaming-rebase test.
  rebase: Allow merge strategies to be used when rebasing
  object-refs: avoid division by zero
---

160a59f326d55970f8a038ef635c662b9c648c75