From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 Apr 2008 04:57:43 +0000 (-0700)
Subject: GIT 1.5.5
X-Git-Tag: v1.5.5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9d831805195ba40b62f632acc6bb6e53d3ec9ee1;p=git.git

GIT 1.5.5

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

diff --git a/Documentation/RelNotes-1.5.5.txt b/Documentation/RelNotes-1.5.5.txt
index 64a52afb9..293221248 100644
--- a/Documentation/RelNotes-1.5.5.txt
+++ b/Documentation/RelNotes-1.5.5.txt
@@ -6,7 +6,7 @@ Updates since v1.5.4
 
 (subsystems)
 
- * Comes with git-gui 0.10.0
+ * Comes with git-gui 0.10.1
 
 (portability)
 
@@ -205,9 +205,3 @@ this release, unless otherwise noted.
 
  * "git imap-send" without setting imap.host did not error out but
    segfaulted.
-
----
-exec >/var/tmp/1
-O=v1.5.5-rc3
-echo O=`git describe refs/heads/master`
-git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
diff --git a/Documentation/git.txt b/Documentation/git.txt
index aaf318993..336fe99cc 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,6 +43,11 @@ 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.5/git.html[documentation for release 1.5.5]
+
+* release notes for
+  link:RelNotes-1.5.5.txt[1.5.5].
+
 * link:v1.5.4.5/git.html[documentation for release 1.5.4.5]
 
 * release notes for
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 565cb41c1..f60bab896 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.5-rc3.GIT
+DEF_VER=v1.5.5.GIT
 
 LF='
 '