From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Apr 2008 07:37:33 +0000 (-0700)
Subject: Merge branch 'maint-1.5.4' into maint
X-Git-Tag: v1.5.5.1~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=464509f790f409d95e0820364ef7296d82942d8c;p=git.git

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  git-bisect: make "start", "good" and "skip" succeed or fail atomically
  git-am: cope better with an empty Subject: line
  Ignore leading empty lines while summarizing merges
  bisect: squelch "fatal: ref HEAD not a symref" misleading message
  builtin-apply: Show a more descriptive error on failure when opening a patch
  Clarify documentation of git-cvsserver, particularly in relation to git-shell
---

464509f790f409d95e0820364ef7296d82942d8c
diff --cc git-am.sh
index ac5c38806,0f05a2cfe..245e1db1f
--- a/git-am.sh
+++ b/git-am.sh
@@@ -117,13 -117,8 +117,9 @@@ It does not apply to blobs recorded in 
      unset GITHEAD_$his_tree
  }
  
- reread_subject () {
- 	git stripspace <"$1" | sed -e 1q
- }
- 
  prec=4
 -dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary=
 +dotest=".dotest"
 +sign= utf8=t keep= skip= interactive= resolved= binary= rebasing=
  resolvemsg= resume=
  git_apply_opt=