Merge branch 'rt/rebase-p-no-merge-summary' into maint

[thirdparty/git.git] / git-rebase--interactive.sh

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 9dfeb539536c55ba3958032d19c539be9ff4750f..b8245cd3fa4bfb0bf27fd3092d3b5479b9d4086f 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -352,8 +352,9 @@ pick_one_preserving_merges () {
                        msg_content="$(commit_message $sha1)"
                        # No point in merging the first parent, that's HEAD
                        new_parents=${new_parents# $first_parent}
+                       merge_args="--no-log --no-ff"
                        if ! do_with_author output eval \
-                       'git merge --no-ff $strategy_args -m "$msg_content" $new_parents'
+                       'git merge $merge_args $strategy_args -m "$msg_content" $new_parents'
                        then
                                printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG
                                die_with_patch $sha1 "Error redoing merge $sha1"