diff options
| -rw-r--r-- | Documentation/RelNotes/2.25.0.txt | 4 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.25.0.txt b/Documentation/RelNotes/2.25.0.txt index b19b771471..cd81216e3e 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 5867391331..2e0ddec5b3 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=' ' |