summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-18 17:20:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-18 17:20:42 (GMT)
commit1022379886946c59f673a871d79be7804fae8746 (patch)
tree31dca821881af8fae85f7af5a61124a3e8547509
parent698eb031bb163b797f90168368de1dec02a57127 (diff)
downloadgit-1022379886946c59f673a871d79be7804fae8746.zip
git-1022379886946c59f673a871d79be7804fae8746.tar.gz
git-1022379886946c59f673a871d79be7804fae8746.tar.bz2
A bunch of micro-fixes before going 2.18 final
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.18.0.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.18.0.txt b/Documentation/RelNotes/2.18.0.txt
index 4d9c038..e276ae0 100644
--- a/Documentation/RelNotes/2.18.0.txt
+++ b/Documentation/RelNotes/2.18.0.txt
@@ -523,6 +523,13 @@ Fixes since v2.17
packfile available to itself.
(merge 3737746120 jk/index-pack-maint later to maint).
+ * Make zlib inflate codepath more robust against versions of zlib
+ that clobber unused portion of outbuf.
+ (merge b611396e97 jl/zlib-restore-nul-termination later to maint).
+
+ * Fix old merge glitch in Documentation during v2.13-rc0 era.
+ (merge 28cb06020b mw/doc-merge-enumfix later to maint).
+
* Other minor doc, test and build updates and code cleanups.
(merge 248f66ed8e nd/trace-with-env later to maint).
(merge 14ced5562c ys/bisect-object-id-missing-conversion-fix later to maint).
@@ -559,3 +566,7 @@ Fixes since v2.17
(merge f156a0934a rd/p4-doc-markup-env later to maint).
(merge 2a00502b14 tg/doc-sec-list later to maint).
(merge 47cc91310a jk/submodule-fsck-loose-fixup later to maint).
+ (merge efde7b725c rd/comment-typofix-in-sha1-file later to maint).
+ (merge 7eedad15df rd/diff-options-typofix later to maint).
+ (merge 58ebd936cc km/doc-workflows-typofix later to maint).
+ (merge 30aa96cdf8 rd/doc-remote-tracking-with-hyphen later to maint).