aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-05 11:08:35 -0800
committerJunio C Hamano <gitster@pobox.com>2009-12-05 11:08:35 -0800
commitaa031314bf8189a15290d5bd0d85fa2a0307ceb7 (patch)
tree18ce5d8e11ba76ef604cfc34346bc25a229be75e
parent77cd6ab62108c2d4ddd4343abd9bae17c406be4b (diff)
downloadgit-1.6.5.5.tar.gz
git-1.6.5.5.tar.xz
Git 1.6.5.5v1.6.5.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes-1.6.5.5.txt9
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
4 files changed, 11 insertions, 5 deletions
diff --git a/Documentation/RelNotes-1.6.5.5.txt b/Documentation/RelNotes-1.6.5.5.txt
index 616e0dd0f..ecfc57d87 100644
--- a/Documentation/RelNotes-1.6.5.5.txt
+++ b/Documentation/RelNotes-1.6.5.5.txt
@@ -18,6 +18,9 @@ Fixes since v1.6.5.4
twice, and held onto memory after it has used the data in it
unnecessarily before it freed.
+ * "git diff -B" and "git diff --dirstat" was not counting newly added
+ contents correctly.
+
* "git format-patch revisions... -- path" issued an incorrect error
message that suggested to use "--" on the command line when path
does not exist in the current work tree (it is a separate matter if
@@ -39,6 +42,8 @@ Fixes since v1.6.5.4
* "git rebase" got confused when the log message began with certain
strings that looked like Subject:, Date: or From: header.
-Other minor documentation updates are included.
+ * "git reset" accidentally run in .git/ directory checked out the
+ work tree contents in there.
-v1.6.5.4-47-gdda8f4b
+
+Other minor documentation updates are included.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 7aa2edee5..8e93d35e4 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.6.5.4/git.html[documentation for release 1.6.5.4]
+* link:v1.6.5.5/git.html[documentation for release 1.6.5.5]
* release notes for
+ link:RelNotes-1.6.5.5.txt[1.6.5.5],
link:RelNotes-1.6.5.4.txt[1.6.5.4],
link:RelNotes-1.6.5.3.txt[1.6.5.3],
link:RelNotes-1.6.5.2.txt[1.6.5.2],
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 6b4f708c0..0c9be2080 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.6.5.4
+DEF_VER=v1.6.5.5
LF='
'
diff --git a/RelNotes b/RelNotes
index 918bab855..5b19dba03 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.6.5.4.txt \ No newline at end of file
+Documentation/RelNotes-1.6.5.5.txt \ No newline at end of file