summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorRalf Thielow <ralf.thielow@gmail.com>2013-08-21 20:48:57 +0200
committerJunio C Hamano <gitster@pobox.com>2013-08-21 15:44:15 -0700
commita9f739c111898ed879bc077fb3a2f71b9766bba7 (patch)
tree091ee674536fba965c690fd93004738a31caa94c /git-rebase--interactive.sh
parent4d06473928ee574910accbde05c19ef2263abdf6 (diff)
downloadgit-a9f739c111898ed879bc077fb3a2f71b9766bba7.tar.gz
rebase --preserve-merges: ignore "merge.log" configrt/rebase-p-no-merge-summary
When "merge.log" config is set, "rebase --preserve-merges" will add the log lines to the message of the rebased merge commit. A rebase should not modify a commit message automatically. Teach "git-rebase" to ignore that configuration by passing "--no-log" to the git-merge call. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
-rw-r--r--git-rebase--interactive.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 83d6d4676b..4743c5963a 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"