summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-18 22:00:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-18 22:00:38 (GMT)
commit005e2dfdf299a7d869fa9ec819171fba574f42eb (patch)
tree5d268eb6fa0c6fb6ec0a159127b5d992a57b824b
parent4b87474bc9b620cf07b09130e33963cdaf34c603 (diff)
downloadgit-1.5.3.6.zip
git-1.5.3.6.tar.gz
git-1.5.3.6.tar.bz2
GIT 1.5.3.6v1.5.3.6
-rw-r--r--Documentation/RelNotes-1.5.3.6.txt14
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 6 insertions, 10 deletions
diff --git a/Documentation/RelNotes-1.5.3.6.txt b/Documentation/RelNotes-1.5.3.6.txt
index c9f948e..069a2b2 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 88a4aca..fa38f37 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='
'