GIT 1.6.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/Documentation/RelNotes-1.6.4.txt b/Documentation/RelNotes-1.6.4.txt
index 0fbc410..7a90441 100644
--- a/Documentation/RelNotes-1.6.4.txt
+++ b/Documentation/RelNotes-1.6.4.txt
@@ -67,6 +67,12 @@
* "git cvsexportcommit" learned -k option to stop CVS keywords expansion
+ * "git fast-export" learned to handle history simplification more
+ gracefully.
+
+ * "git fast-export" learned an option --tag-of-filtered-object to handle
+ dangling tags resulting from history simplification more usefully.
+
* "git grep" learned -p option to show the location of the match using the
same context hunk marker "git diff" uses.
@@ -130,15 +136,12 @@
section header has a variable definition on the same line, lost
that variable definition.
+ * "git rebase -p --onto" used to always leave side branches of a merge
+ intact, even when both branches are subject to rewriting.
+
* "git repack" used to faithfully follow grafts and considered true
parents recorded in the commit object unreachable from the commit.
After such a repacking, you cannot remove grafts without corrupting
the repository.
* "git send-email" did not detect erroneous loops in alias expansion.
-
----
-exec >/var/tmp/1
-echo O=$(git describe master)
-O=v1.6.4-rc2-31-g2ceb639
-git shortlog --no-merges $O..master ^maint
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 67bc0b3..5fd5953 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,6 +43,11 @@
branch of the `git.git` repository.
Documentation for older releases are available here:
+* link:v1.6.4/git.html[documentation for release 1.6.4]
+
+* release notes for
+ link:RelNotes-1.6.4.txt[1.6.4].
+
* link:v1.6.3.4/git.html[documentation for release 1.6.3.4]
* release notes for
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 39cde78..d8ae315 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.6.3.GIT
+DEF_VER=v1.6.4
LF='
'
