Code

Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:45:21 +0000 (10:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:45:21 +0000 (10:45 -0700)
commite31b0183729cab2d6a8e2c76f009017355dacf06
treef76385fbc62c0bd508891c681594537f378fcf50
parentbc67ad8c375ce8f31021411f088a968f12cb2675
parentc192f9c865dbdae48c0400d717581d34cd315fb8
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