From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 May 2011 17:45:21 +0000 (-0700)
Subject: Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
X-Git-Tag: v1.7.5.2~22
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e31b0183729cab2d6a8e2c76f009017355dacf06;p=git.git

Merge branch 'aw/maint-rebase-i-p-no-ff' into maint

* aw/maint-rebase-i-p-no-ff:
  git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
---

e31b0183729cab2d6a8e2c76f009017355dacf06