Git 2.25.5

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

diff --git a/Documentation/RelNotes/2.25.5.txt b/Documentation/RelNotes/2.25.5.txt
new file mode 100644 (file)
index 0000000..fcb9566
--- /dev/null
+++ b/Documentation/RelNotes/2.25.5.txt
@@ -0,0 +1,7 @@
+Git v2.25.5 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6, v2.20.5, v2.21.4, v2.22.5, v2.23.4 and v2.24.4 to address
+the security issue CVE-2021-21300; see the release notes for
+these versions for details.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 77217e089748f0b92a88bc6e64f5f741fa9be6b4..0341b5d939e3246b738636fb5fe0f4852b507dbe 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.25.4
+DEF_VER=v2.25.5
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index f579f9f817f741268a49a6a22d640f50f235cb92..1bcc5047f352635537b6c1cf3caddb63d3ea6630 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.25.4.txt
\ No newline at end of file
+Documentation/RelNotes/2.25.5.txt
\ No newline at end of file