From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Nov 2007 22:00:38 +0000 (-0800)
Subject: GIT 1.5.3.6
X-Git-Tag: v1.5.3.6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=114ad397ec6ea5f514e11d9e6294fc148f56e214;p=git.git

GIT 1.5.3.6
---

diff --git a/Documentation/RelNotes-1.5.3.6.txt b/Documentation/RelNotes-1.5.3.6.txt
index c9f948ec0..069a2b2cf 100644
--- a/Documentation/RelNotes-1.5.3.6.txt
+++ b/Documentation/RelNotes-1.5.3.6.txt
@@ -4,16 +4,18 @@ GIT v1.5.3.6 Release Notes
 Fixes since v1.5.3.5
 --------------------
 
- * git-cvsexportcommit handles root commits better;
+ * git-cvsexportcommit handles root commits better.
 
  * git-svn dcommit used to clobber when sending a series of
-   patches;
+   patches.
 
  * git-svn dcommit failed after attempting to rebase when
    started with a dirty index; now it stops upfront.
 
  * git-grep sometimes refused to work when your index was
-   unmerged;
+   unmerged.
+
+ * "git-grep -A1 -B2" acted as if it was told to run "git -A1 -B21".
 
  * git-hash-object did not honor configuration variables, such as
    core.compression.
@@ -44,9 +46,3 @@ Fixes since v1.5.3.5
    of deflateBound() has been added.
 
  * Quite a lot of documentation clarifications.
-
---
-exec >/var/tmp/1
-O=v1.5.3.5-57-gb574c8d
-echo O=`git describe refs/heads/maint`
-git shortlog --no-merges $O..refs/heads/maint
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 88a4acad1..fa38f373a 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.3.5.GIT
+DEF_VER=v1.5.3.6.GIT
 
 LF='
 '