From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 Mar 2008 08:03:16 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc0~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1eaa541f5fbda3fc30085da4f75e99dfae4ec9b3?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Start draft ReleaseNotes for 1.5.4.5
rebase -m: do not trigger pre-commit verification

Conflicts:

RelNotes
---

1eaa541f5fbda3fc30085da4f75e99dfae4ec9b3
diff --combined git-rebase.sh
index ff66af3ba8,bc0c1c4abc..60c458f201
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@@ -18,7 -18,8 +18,7 @@@ original <branch> and remove the .dotes
  git rebase --abort instead.
  
  Note that if <branch> is not specified on the command line, the
 -currently checked out branch is used.  You must be in the top
 -directory of your project to start (or continue) a rebase.
 +currently checked out branch is used.
  
  Example:       git-rebase master~1 topic
  
@@@ -62,7 -63,7 +62,7 @@@ continue_merge () 
  	cmt=`cat "$dotest/current"`
  	if ! git diff-index --quiet HEAD --
  	then
- 		if ! git-commit -C "$cmt"
+ 		if ! git commit --no-verify -C "$cmt"
  		then
  			echo "Commit failed, please do not call \"git commit\""
  			echo "directly, but instead do one of the following: "
@@@ -375,7 -376,7 +375,7 @@@ f
  if test -z "$do_merge"
  then
  	git format-patch -k --stdout --full-index --ignore-if-in-upstream "$upstream"..ORIG_HEAD |
 -	git am $git_am_opt --binary -3 -k --resolvemsg="$RESOLVEMSG" &&
 +	git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" &&
  	move_to_original_branch
  	ret=$?
  	test 0 != $ret -a -d .dotest &&