Git 2.5

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

diff --git a/Documentation/git.txt b/Documentation/git.txt
index f3ab11c2e8d813d3e27b93d0abe34c33edfa04c9..f4cb5cb200cf69461d5af39d4c29b51138e4d3ec 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,6 +43,11 @@ unreleased) version of Git, that is available from the '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:v2.5.0/git.html[documentation for release 2.5]
+
+* release notes for
+  link:RelNotes/2.5.0.txt[2.5],
+

 * link:v2.4.7/git.html[documentation for release 2.4.7]
 
 * release notes for
 * link:v2.4.7/git.html[documentation for release 2.4.7]
 
 * release notes for

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 29f2152f465fec5a9bd5363fcba79ff3273569e8..cd968201627162f36e56e078d5631a19ef505b08 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=v2.5.0-rc3
+DEF_VER=v2.5.0

 
 LF='
 '
 
 LF='
 '