Git 2.25-rc2

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

diff --git a/Documentation/RelNotes/2.25.0.txt b/Documentation/RelNotes/2.25.0.txt
index b19b7714716fbc9f650e7ab962e2b00821d29b44..cd81216e3e79b34f42ea999543c94ce953f68dbb 100644 (file)
--- 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 586739133199cadc6d7ba7975f18d93d6f171ede..2e0ddec5b34d59cec1ba7815f3847b64d2a18aaf 100755 (executable)
--- 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='
 '