Git 1.6.5.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes-1.6.5.5.txt b/Documentation/RelNotes-1.6.5.5.txt
index 616e0dd0fdacec6e26a9e5ce5d970e2ecec041c5..ecfc57d87563fbba6ae42785567213774dcde076 100644 (file)
--- 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.
 
    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
  * "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.
 
  * "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 7aa2edee58055777dfde80648d7d67d23d21746c..8e93d35e440818b1181e72a7453602ae8d377fc9 100644 (file)
--- 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:
 
 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
 
 * 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],
   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 6b4f708c0d7bd881d6e9baa12d91ee338c4bec42..0c9be2080bccacc9c11ee3db1a24828e7ae7d576 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.6.5.4
+DEF_VER=v1.6.5.5

 
 LF='
 '
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index 918bab855c536c85db4271faa219a6b0348ed128..5b19dba037484d1a5618621e9a56e164f697c11d 120000 (symlink)
--- 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