diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-11 15:00:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-11 15:00:56 -0700 |
| commit | 8c731e9c8f92b138c31a0897321a2578ba9221e5 (patch) | |
| tree | 5bfc849cc4fc3e8c2e93da64ecf627defc005a06 /git-rebase--interactive.sh | |
| parent | 04e3274d6a3dd79be0649d5c13fb0b24edefdbda (diff) | |
| parent | a9f739c111898ed879bc077fb3a2f71b9766bba7 (diff) | |
| download | git-8c731e9c8f92b138c31a0897321a2578ba9221e5.tar.gz git-8c731e9c8f92b138c31a0897321a2578ba9221e5.tar.xz | |
Merge branch 'rt/rebase-p-no-merge-summary'
"git rebase -p" internally used the merge machinery, but when
rebasing, there should not be a need for merge summary.
* rt/rebase-p-no-merge-summary:
rebase --preserve-merges: ignore "merge.log" config
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 9dfeb5395..b8245cd3f 100644 --- 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" |