From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 18 Oct 2007 07:11:03 +0000 (-0400)
Subject: Yet more 1.5.3.5 fixes mentioned in release notes
X-Git-Tag: v1.5.3.5~33
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1aa3d01f870a68dc46a872c83f9cd051f172f9b3;p=git.git

Yet more 1.5.3.5 fixes mentioned in release notes

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/Documentation/RelNotes-1.5.3.5.txt b/Documentation/RelNotes-1.5.3.5.txt
index de38a84ad..78df41825 100644
--- a/Documentation/RelNotes-1.5.3.5.txt
+++ b/Documentation/RelNotes-1.5.3.5.txt
@@ -10,9 +10,14 @@ Fixes since v1.5.3.4
  * "git-config --file" failed if the argument used a relative path
    as it changed directories before opening the file.
 
+ * "git-config --file" now displays a proper error message if it
+   cannot read the file specified on the command line.
+
  * "git-config", "git-diff", "git-apply" failed if run from a
    subdirectory with relative GIT_DIR and GIT_WORK_TREE set.
 
+ * "git-blame" crashed if run during a merge conflict.
+
  * "git-add -i" did not handle single line hunks correctly.
 
  * "git-rebase -i" failed if external diff drivers were used for one
@@ -33,6 +38,9 @@ Fixes since v1.5.3.4
 
  * "git-instaweb" no longer fails on Mac OS X.
 
+ * post-receive-email example hook fixed was fixed for
+   non-fast-forward updates.
+
  * Documentation updates for supported (but previously undocumented)
    options of "git-archive" and "git-reflog".