From: Junio C Hamano Date: Wed, 6 Aug 2008 19:04:06 +0000 (-0700) Subject: GIT 1.5.6.5 X-Git-Tag: v1.5.6.5^0 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=781c1834f5419bdf81bb7f3750170ccd6b809174;p=git.git GIT 1.5.6.5 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/RelNotes-1.5.6.5.txt b/Documentation/RelNotes-1.5.6.5.txt index 23981acf3..47ca17246 100644 --- 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 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". @@ -24,9 +27,3 @@ Fixes since v1.5.6.4 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 33ae79b9d..0f55f8005 100644 --- 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: -* 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 - 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] diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index f22144747..445dca3ff 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.5.6.GIT +DEF_VER=v1.5.6.5.GIT LF=' '