aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-03 22:42:15 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-03 22:47:48 -0700
commit6c7f58d6f691c1091b90b0891e94c91e20fd6054 (patch)
tree700cf0a9cfc843ba3f729e9bc26f0d378e2ee048
parent84201eae771fbb1d774cf1356d89016053e56778 (diff)
downloadgit-6c7f58d6f691c1091b90b0891e94c91e20fd6054.tar.gz
git-6c7f58d6f691c1091b90b0891e94c91e20fd6054.tar.xz
GIT 1.6.3.2v1.6.3.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes-1.6.3.2.txt12
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 6 insertions, 8 deletions
diff --git a/Documentation/RelNotes-1.6.3.2.txt b/Documentation/RelNotes-1.6.3.2.txt
index 0b48d1a1d..b2f3f0293 100644
--- a/Documentation/RelNotes-1.6.3.2.txt
+++ b/Documentation/RelNotes-1.6.3.2.txt
@@ -37,13 +37,17 @@ Fixes since v1.6.3.1
the first hunk that adds a line at the top was split into two and
both halves are marked to be used.
+ * "git blame path" misbehaved at the commit where path became file
+ from a directory with some files in it.
+
* "git for-each-ref" had a segfaulting bug when dealing with a tag object
created by an ancient git.
* "git format-patch -k" still added patch numbers if format.numbered
configuration was set.
- * "git grep --color ''" did not terminate.
+ * "git grep --color ''" did not terminate. The command also had
+ subtle bugs with its -w option.
* http-push had a small use-after-free bug.
@@ -55,9 +59,3 @@ Fixes since v1.6.3.1
Many other general usability updates around help text, diagnostic messages
and documentation are included as well.
-
----
-exec >/var/tmp/1
-O=v1.6.3.1-68-g456cb4c
-echo O=$(git describe maint)
-git shortlog --no-merges $O..maint
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index d292e3a2d..0673f0db9 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.6.3.1
+DEF_VER=v1.6.3.2
LF='
'