From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 May 2011 17:50:00 +0000 (-0700)
Subject: Merge branch 'aw/maint-rebase-i-p-no-ff'
X-Git-Tag: v1.7.6-rc0~104
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9fdc1cc872308869d76665be55367eef48f05ff6;p=git.git

Merge branch 'aw/maint-rebase-i-p-no-ff'

* aw/maint-rebase-i-p-no-ff:
  git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff

Conflicts:
	git-rebase--interactive.sh
---

9fdc1cc872308869d76665be55367eef48f05ff6
diff --cc git-rebase--interactive.sh
index 6566d319a,c308529a9..41ba96aeb
mode 100644,100755..100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -270,13 -339,12 +270,13 @@@ 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:+-s $strategy} -m \
 -				git merge --no-ff $STRATEGY -m "$msg" $new_parents
++				git merge --no-ff ${strategy:+-s $strategy} -m \
 +					"$msg_content" $new_parents
  			then
 -				printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG
 +				printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG
  				die_with_patch $sha1 "Error redoing merge $sha1"
  			fi
 -			echo "$sha1 $(git rev-parse HEAD^0)" >> "$REWRITTEN_LIST"
 +			echo "$sha1 $(git rev-parse HEAD^0)" >> "$rewritten_list"
  			;;
  		*)
  			output git cherry-pick "$@" ||