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

diff --cc git-rebase--interactive.sh
index 6566d319aa121fc8f89fff28d0169fd9a1723537,c308529a9f1f668f02d63cfddcbac10770faa723..41ba96aeb7f8ee32f7c346d5d7934f4d6b305d2f
mode 100644,100755..100644
--- 1/git-rebase--interactive.sh
--- 2/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -270,13 -339,12 +270,13 @@@ pick_one_preserving_merges () 
                        # No point in merging the first parent, that's HEAD
                        new_parents=${new_parents# $first_parent}
                        if ! do_with_author output \
-                               git merge ${strategy:+-s $strategy} -m \
 -                              git merge --no-ff $STRATEGY -m "$msg" $new_parents
++                              git merge --no-ff ${strategy:+-s $strategy} -m \
 +                                      "$msg_content" $new_parents
                        then
 -                              printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG
 +                              printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG
                                die_with_patch $sha1 "Error redoing merge $sha1"
                        fi
 -                      echo "$sha1 $(git rev-parse HEAD^0)" >> "$REWRITTEN_LIST"
 +                      echo "$sha1 $(git rev-parse HEAD^0)" >> "$rewritten_list"
                        ;;
                *)
                        output git cherry-pick "$@" ||