From fd59c5bdeeb50f18e86f36cbf7a0b82554621690 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 23 Jun 2022 12:36:14 +0200 Subject: [PATCH] Git 2.36.2 Signed-off-by: Johannes Schindelin --- Documentation/RelNotes/2.36.2.txt | 14 ++++++++++---- GIT-VERSION-GEN | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Documentation/RelNotes/2.36.2.txt b/Documentation/RelNotes/2.36.2.txt index ba5d5acd07..958f5b4102 100644 --- a/Documentation/RelNotes/2.36.2.txt +++ b/Documentation/RelNotes/2.36.2.txt @@ -1,10 +1,16 @@ Git v2.36.2 Release Notes ========================= -This maintenance release is primarily to merge down updates to the -build and CI procedures from the 'master' front, in order to ensure -that we can cut healthy maintenance releases in the future. It also -contains a handful of small and trivially-correct bugfixes. +This release merges up the fixes that appear in v2.30.5, v2.31.4, +v2.32.3, v2.33.4, v2.34.4 and v2.35.4 to address the security +issue CVE-2022-29187; see the release notes for these versions +for details. + +Apart from that, this maintenance release is primarily to merge down +updates to the build and CI procedures from the 'master' front, in +order to ensure that we can cut healthy maintenance releases in the +future. It also contains a handful of small and trivially-correct +bugfixes. Fixes since v2.36.1 ------------------- diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index c1e8552d27..12f26c83d6 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.36.1 +DEF_VER=v2.36.2 LF=' ' -- 2.11.4.GIT