Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Thu, 18 Oct 2007 07:11:17 +0000 (03:11 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 18 Oct 2007 07:11:17 +0000 (03:11 -0400)
commite75c55844fd0ff96d00173574b1e49cc472ca928
tree1146c04d598cdb0857e9072e82eee2338f8ee4a4
parent8f353ee57a2f79697f8dea80ad3174998586bc75
parent1aa3d01f870a68dc46a872c83f9cd051f172f9b3
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
contrib/hooks/post-receive-email
read-cache.c