From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Nov 2007 01:06:57 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.4-rc0~136
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9;p=git.git

Merge branch 'maint'

* maint:
  scripts: do not get confused with HEAD in work tree
  Improve description of git-branch -d and -D in man page.
---

d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9
diff --cc git-rebase--interactive.sh
index bf44b6af5,ff38a22ed..e9cd6fd99
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -356,10 -331,8 +356,10 @@@ d
  		git rev-parse --verify HEAD > /dev/null &&
  		git update-index --refresh &&
  		git diff-files --quiet &&
- 		! git diff-index --cached --quiet HEAD &&
+ 		! git diff-index --cached --quiet HEAD -- &&
 -		. "$DOTEST"/author-script &&
 +		. "$DOTEST"/author-script && {
 +			test ! -f "$DOTEST"/amend || git reset --soft HEAD^
 +		} &&
  		export GIT_AUTHOR_NAME GIT_AUTHOR_NAME GIT_AUTHOR_DATE &&
  		git commit -F "$DOTEST"/message -e