From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Sep 2013 22:00:56 +0000 (-0700)
Subject: Merge branch 'rt/rebase-p-no-merge-summary'
X-Git-Tag: v1.8.5-rc0~149
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8c731e9c8f92b138c31a0897321a2578ba9221e5?ds=inline;hp=-c

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
---

8c731e9c8f92b138c31a0897321a2578ba9221e5
diff --combined git-rebase--interactive.sh
index 9dfeb53953,4743c5963a..b8245cd3fa
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -352,8 -352,9 +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"
@@@ -671,7 -672,7 +672,7 @@@ skip_unnecessary_picks () 
  				;;
  			esac
  			;;
 -		3,#*|3,)
 +		3,"$comment_char"*|3,)
  			# copy comments
  			;;
  		*)