summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-05-06 01:07:04 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-05-06 01:07:04 -0700
commit9159afbfce955db86373dab95b5f8e31fb763dae (patch)
tree10e316d2fe84a19de61878c68171094f6dfeb022
parentMerge branch 'maint' (diff)
downloadtgif-9159afbfce955db86373dab95b5f8e31fb763dae.tar.xz
GIT v1.5.2-rc2
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/RelNotes-1.5.2.txt2
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/RelNotes-1.5.2.txt b/Documentation/RelNotes-1.5.2.txt
index 712ebb0b78..02b8ea0a68 100644
--- a/Documentation/RelNotes-1.5.2.txt
+++ b/Documentation/RelNotes-1.5.2.txt
@@ -171,6 +171,6 @@ this release, unless otherwise noted.
--
exec >/var/tmp/1
-O=v1.5.2-rc0-106-g07c785d
+O=v1.5.2-rc1-32-g125a5f1
echo O=`git describe refs/heads/master`
git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 0a6ea68dec..f6adb91ed2 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.2-rc1.GIT
+DEF_VER=v1.5.2-rc2.GIT
LF='
'