From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Apr 2008 07:45:52 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6-rc0~144
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a17b1d2f0b3128be6f116bf22b58244b310d27b9;p=git.git

Merge branch 'maint'

* maint:
  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
---

a17b1d2f0b3128be6f116bf22b58244b310d27b9