diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-04-11 21:27:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-04-11 21:27:02 -0700 |
| commit | 11cfe552610386954886543f5de87dcc49ad5735 (patch) | |
| tree | 402b8c715371575be167236bd781749a90ac36d2 | |
| parent | Merge branch 'ja/i18n-fix-for-2.36' (diff) | |
| download | tgif-11cfe552610386954886543f5de87dcc49ad5735.tar.xz | |
Git 2.36-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/2.36.0.txt | 2 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.36.0.txt b/Documentation/RelNotes/2.36.0.txt index 8da5b2e1e7..d61ade21e2 100644 --- a/Documentation/RelNotes/2.36.0.txt +++ b/Documentation/RelNotes/2.36.0.txt @@ -397,6 +397,8 @@ Fixes since v2.35 entry it moved. (merge b7f9130a06 vd/mv-refresh-stat later to maint). + * Fix for CVE-2022-24765 has been merged up from 2.35.2 and others. + * Other code cleanup, docfix, build fix, etc. (merge cfc5cf428b jc/find-header later to maint). (merge 40e7cfdd46 jh/p4-fix-use-of-process-error-exception later to maint). diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 1c5f645167..9252e0430d 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.36.0-rc1 +DEF_VER=v2.36.0-rc2 LF=' ' |