X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-rebase--interactive.sh;h=c308529a9f1f668f02d63cfddcbac10770faa723;hb=f22a17e8da25a043950a13f11035930922bb86e7;hp=5873ba4bc3b2a94cd7754ae572072fd745dc059d;hpb=5cb3c9b7dff15f762d63df0b6f2d6b4bf82565e9;p=git.git

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 5873ba4bc..c308529a9 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -339,7 +339,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 -m "$msg" $new_parents
+				git merge --no-ff $STRATEGY -m "$msg" $new_parents
 			then
 				printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG
 				die_with_patch $sha1 "Error redoing merge $sha1"