Git 2.25.5

dscho · dscho · commit 42ce4c7930ff · 2021-02-12T15:49:55.000+01:00
Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/Documentation/RelNotes/2.25.5.txt 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
@@ -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
@@ -1 +1 @@
-Documentation/RelNotes/2.25.4.txt
+Documentation/RelNotes/2.25.5.txt
