Merge branch 'maint'

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 6566d319aa121fc8f89fff28d0169fd9a1723537..41ba96aeb7f8ee32f7c346d5d7934f4d6b305d2f 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -270,7 +270,7 @@ 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:+-s $strategy} -m \
                                        "$msg_content" $new_parents
                        then
                                printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG