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
Junio C Hamano committed
May 13, 2011 at 10:45 UTC
e31b0183729cab2d6a8e2c76f009017355dacf06
No changes.