Merge branch 'aw/maint-rebase-i-p-no-ff'
* aw/maint-rebase-i-p-no-ff: git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff Conflicts: git-rebase--interactive.sh
Junio C Hamano committed
May 6, 2011 at 10:50 UTC
9fdc1cc872308869d76665be55367eef48f05ff6
No changes.