GIT 1.5.3.6

diff --git a/Documentation/RelNotes-1.5.3.6.txt b/Documentation/RelNotes-1.5.3.6.txt
index c9f948ec0e3586919cedbc4cc26e5c5a3d49de4d..069a2b2cf9e9f28a2f9e6dc0817723a38b25f475 100644 (file)
--- 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
 --------------------
 
 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
 
  * 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
 
  * 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.
 
  * 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.
    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 88a4acad151de6705bb54b173c1a0b4983438bcb..fa38f373ac6875d56b40f0ec3efda71627e96075 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v1.5.3.5.GIT
+DEF_VER=v1.5.3.6.GIT

 
 LF='
 '
 
 LF='
 '