From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 18 Oct 2007 07:11:17 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.4-rc0~343
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e75c55844fd0ff96d00173574b1e49cc472ca928;p=git.git

Merge branch 'maint'

* maint:
  Yet more 1.5.3.5 fixes mentioned in release notes
  cvsserver: Use exit 1 instead of die when req_Root fails.
  git-blame shouldn't crash if run in an unmerged tree
  git-config: print error message if the config file cannot be read
  fixing output of non-fast-forward output of post-receive-email
---

e75c55844fd0ff96d00173574b1e49cc472ca928