Merge 1.5.5.4 in

diff --git a/Documentation/RelNotes-1.5.3.5.txt b/Documentation/RelNotes-1.5.3.5.txt
index e28d92f61811f5ba3d31d71e299c209a3a6ea74b..7ff1d5d0d100fc632208f4cbb67189ecbf58e9a4 100644 (file)
--- a/Documentation/RelNotes-1.5.3.5.txt
+++ b/Documentation/RelNotes-1.5.3.5.txt
@@ -63,8 +63,8 @@ Fixes since v1.5.3.4
 
  * Git segfaulted when reading an invalid .gitattributes file.  Fixed.
 
- * post-receive-email example hook fixed was fixed for
-   non-fast-forward updates.
+ * post-receive-email example hook was fixed for non-fast-forward
+   updates.
 
  * Documentation updates for supported (but previously undocumented)
    options of "git-archive" and "git-reflog".
@@ -87,8 +87,8 @@ Fixes since v1.5.3.4
  * A few workarounds to squelch false warnings from recent gcc have
    been added.
 
---
-exec >/var/tmp/1
-O=v1.5.3.4-55-gf120ae2
-echo O=`git describe refs/heads/maint`
-git shortlog --no-merges $O..refs/heads/maint
+ * "git-send-pack $remote frotz" segfaulted when there is nothing
+   named 'frotz' on the local end.
+
+ * "git-rebase --interactive" did not handle its "--strategy" option
+   properly.