From 42ce4c7930ff494136256554cbed730857084c70 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 12 Feb 2021 15:49:55 +0100 Subject: [PATCH] Git 2.25.5 Signed-off-by: Johannes Schindelin --- Documentation/RelNotes/2.25.5.txt | 7 +++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes/2.25.5.txt diff --git a/Documentation/RelNotes/2.25.5.txt b/Documentation/RelNotes/2.25.5.txt new file mode 100644 index 0000000000..fcb9566b15 --- /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 77217e0897..0341b5d939 100755 --- 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 f579f9f817..1bcc5047f3 120000 --- 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