aboutsummaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/2.36.0.txt
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2022-04-13 14:51:53 +0800
committerJiang Xin <worldhello.net@gmail.com>2022-04-13 14:51:53 +0800
commit61de00a32115b6090891f20797fdfd1501709ab9 (patch)
treee6a0290cef9e52589a8b78e55dbae3daf559e202 /Documentation/RelNotes/2.36.0.txt
parentdfbdf52df590cf8af37b193d9bf9f9a41162f3ae (diff)
parent11cfe552610386954886543f5de87dcc49ad5735 (diff)
downloadgit-61de00a32115b6090891f20797fdfd1501709ab9.tar.xz
Merge branch 'master' of github.com:git/git
* 'master' of github.com:git/git: (25 commits) Git 2.36-rc2 i18n: fix some badly formatted i18n strings Git 2.36-rc1 t9902: split test to run on appropriate systems ls-tree doc: document interaction with submodules Documentation: add --batch-command to cat-file synopsis git-ls-tree.txt: fix the name of "%(objectsize:padded)" submodule-helper: fix usage string doc: replace "--" with {litdd} in credential-cache/fsmonitor contrib/scalar: fix 'all' target in Makefile Documentation/Makefile: fix "make info" regression in dad9cd7d518 configure.ac: fix HAVE_SYNC_FILE_RANGE definition git-compat-util: really support openssl as a source of entropy ls-tree: `-l` should not imply recursive listing Git 2.35.2 Git 2.34.2 Git 2.33.2 Git 2.32.1 Git 2.31.2 Git 2.30.3 ...
Diffstat (limited to 'Documentation/RelNotes/2.36.0.txt')
-rw-r--r--Documentation/RelNotes/2.36.0.txt2
1 files changed, 2 insertions, 0 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).