From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 31 Oct 2007 04:44:43 +0000 (-0700)
Subject: Merge branch 'maint' into HEAD
X-Git-Tag: v1.5.4-rc0~297
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9c51414f8efb73525a6c69917f1499dab081679d;p=git.git

Merge branch 'maint' into HEAD

* maint:
  Update GIT 1.5.3.5 Release Notes
  git-rebase--interactive.sh: Make 3-way merge strategies work for -p.
  git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.
  Fix --strategy parsing in git-rebase--interactive.sh
  Make merge-recursive honor diff.renamelimit
  cherry-pick/revert: more compact user direction message
  core-tutorial: Use new syntax for git-merge.
  git-merge: document but discourage the historical syntax
  Prevent send-pack from segfaulting (backport from 'master')
  Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in example

Conflicts:

	git-rebase--interactive.sh
---

9c51414f8efb73525a6c69917f1499dab081679d
diff --cc git-rebase--interactive.sh
index 0dd77b400,f28c3df20..76dc679e6
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -171,24 -163,21 +171,26 @@@ pick_one_preserving_merges () 
  			# redo merge
  			author_script=$(get_author_ident_from_commit $sha1)
  			eval "$author_script"
 -			msg="$(git cat-file commit $sha1 | \
 -				sed -e '1,/^$/d' -e "s/[\"\\]/\\\\&/g")"
 +			msg="$(git cat-file commit $sha1 | sed -e '1,/^$/d')"
+ 			# No point in merging the first parent, that's HEAD
+ 			new_parents=${new_parents# $first_parent}
  			# NEEDSWORK: give rerere a chance
 -			if ! output git merge $STRATEGY -m "$msg" $new_parents
 +			if ! GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
 +				GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
 +				GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
 +				output git merge $STRATEGY -m "$msg" \
 +					$new_parents
  			then
 -				echo "$msg" > "$GIT_DIR"/MERGE_MSG
 +				printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG
  				die Error redoing merge $sha1
  			fi
  			;;
  		*)
- 			output git cherry-pick $STRATEGY "$@" ||
+ 			output git cherry-pick "$@" ||
  				die_with_patch $sha1 "Could not pick $sha1"
 +			;;
  		esac
 +		;;
  	esac
  }