summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-03-27 20:43:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-03-27 20:43:51 -0700
commit803d5158123346229d71de53818920efbc88ca0f (patch)
tree60a221421bf3333858786ef3a7a2ef74203cd0b2
parentbuiltin-prune: protect objects listed on the command line (diff)
parentGIT 1.5.4.5 (diff)
downloadtgif-803d5158123346229d71de53818920efbc88ca0f.tar.xz
GIT 1.5.5-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes-1.5.4.5.txt6
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
3 files changed, 3 insertions, 8 deletions
diff --git a/Documentation/RelNotes-1.5.4.5.txt b/Documentation/RelNotes-1.5.4.5.txt
index 56fcd27b5c..0282341398 100644
--- a/Documentation/RelNotes-1.5.4.5.txt
+++ b/Documentation/RelNotes-1.5.4.5.txt
@@ -54,9 +54,3 @@ Fixes since v1.5.4.4
"rebase --continue" impossible.
As usual, it also comes with many documentation fixes and clarifications.
-
---
-exec >/var/tmp/1
-echo O=$(git describe maint)
-O=v1.5.4.4-32-gb88605f
-git shortlog --no-merges $O..maint
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 3ed24d449a..aaf3189936 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.5.4.4/git.html[documentation for release 1.5.4.4]
+* link:v1.5.4.5/git.html[documentation for release 1.5.4.5]
* release notes for
+ link:RelNotes-1.5.4.5.txt[1.5.4.5],
link:RelNotes-1.5.4.4.txt[1.5.4.4],
link:RelNotes-1.5.4.3.txt[1.5.4.3],
link:RelNotes-1.5.4.2.txt[1.5.4.2],
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index d0b60f40d8..7529af9315 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.5-rc1.GIT
+DEF_VER=v1.5.5-rc2.GIT
LF='
'