GIT 1.5.6.5

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

diff --git a/Documentation/RelNotes-1.5.6.5.txt b/Documentation/RelNotes-1.5.6.5.txt
index 23981acf3974a3c609c8ad91683b03a7b8676a39..47ca1724620fa25491c27984a41ca56e2aa4e323 100644 (file)
--- a/Documentation/RelNotes-1.5.6.5.txt
+++ b/Documentation/RelNotes-1.5.6.5.txt
@@ -6,6 +6,9 @@ Fixes since v1.5.6.4
 
 * "git cvsimport" used to spit out "UNKNOWN LINE..." diagnostics to stdout.
 
 
 * "git cvsimport" used to spit out "UNKNOWN LINE..." diagnostics to stdout.
 

+* "git commit -F filename" and "git tag -F filename" run from subdirectories
+  did not read the right file.
+

 * "git init --template=" with blank "template" parameter linked files
   under root directories to .git, which was a total nonsense.  Instead, it
   means "I do not want to use anything from the template directory".
 * "git init --template=" with blank "template" parameter linked files
   under root directories to .git, which was a total nonsense.  Instead, it
   means "I do not want to use anything from the template directory".


@@ -24,9 +27,3 @@ Fixes since v1.5.6.4
   header properly.
 
 Contains other various documentation fixes.
   header properly.
 
 Contains other various documentation fixes.

-
---
-exec >/var/tmp/1
-echo O=$(git describe maint)
-O=v1.5.6.4-26-g2b6ca6d
-git shortlog --no-merges $O..maint

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 33ae79b9d559b80816b9c26af389a0be6de41162..0f55f8005b651a5df9ec56c8b42c55ed6dfa1f08 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,12 +43,14 @@ 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.5.6.3/git.html[documentation for release 1.5.6.3]
+* link:v1.5.6.5/git.html[documentation for release 1.5.6.5]

 
 * release notes for
 
 * release notes for

-  link:RelNotes-1.5.6.3.txt[1.5.6.3].
-  link:RelNotes-1.5.6.2.txt[1.5.6.2].
-  link:RelNotes-1.5.6.1.txt[1.5.6.1].
+  link:RelNotes-1.5.6.5.txt[1.5.6.5],
+  link:RelNotes-1.5.6.4.txt[1.5.6.4],
+  link:RelNotes-1.5.6.3.txt[1.5.6.3],
+  link:RelNotes-1.5.6.2.txt[1.5.6.2],
+  link:RelNotes-1.5.6.1.txt[1.5.6.1],

   link:RelNotes-1.5.6.txt[1.5.6].
 
 * link:v1.5.5.4/git.html[documentation for release 1.5.5.4]
   link:RelNotes-1.5.6.txt[1.5.6].
 
 * link:v1.5.5.4/git.html[documentation for release 1.5.5.4]

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index f221447478aea8628c0ab6d098338f7e8630201e..445dca3ffcb7074dc58ee41d971c1164e97ee14f 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.5.6.GIT
+DEF_VER=v1.5.6.5.GIT

 
 LF='
 '
 
 LF='
 '