summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-01-08 20:43:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-01-08 20:44:13 (GMT)
commit7a6a90c6ec48fc78c83d7090d6c1b95d8f3739c0 (patch)
tree6384cf5c9d09404a58711fcad2f7e738e537fb09
parent1f5f3ffe5ceae12f0f7d78c42f657d9fee48fde2 (diff)
downloadgit-7a6a90c6ec48fc78c83d7090d6c1b95d8f3739c0.zip
git-7a6a90c6ec48fc78c83d7090d6c1b95d8f3739c0.tar.gz
git-7a6a90c6ec48fc78c83d7090d6c1b95d8f3739c0.tar.bz2
Git 2.25-rc2v2.25.0-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.25.0.txt4
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.25.0.txt b/Documentation/RelNotes/2.25.0.txt
index b19b771..cd81216 100644
--- a/Documentation/RelNotes/2.25.0.txt
+++ b/Documentation/RelNotes/2.25.0.txt
@@ -367,3 +367,7 @@ Fixes since v2.24
(merge 4e61b2214d ew/packfile-syscall-optim later to maint).
(merge ace0f86c7f pb/clarify-line-log-doc later to maint).
(merge 763a59e71c en/merge-recursive-oid-eq-simplify later to maint).
+ (merge 4e2c4c0d4f do/gitweb-typofix-in-comments later to maint).
+ (merge 421c0ffb02 jb/doc-multi-pack-idx-fix later to maint).
+ (merge f8740c586b pm/am-in-body-header-doc-update later to maint).
+ (merge 5814d44d9b tm/doc-submodule-absorb-fix later to maint).
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 5867391..2e0ddec 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.25.0-rc1
+DEF_VER=v2.25.0-rc2
LF='
'