The eighth batch

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/2.36.0.txt b/Documentation/RelNotes/2.36.0.txt
index 78e037b86532978622ac3f733bf6354b768f5687..de1e11e25a23b81db0aac1d87ec097493a47765b 100644 (file)
--- a/Documentation/RelNotes/2.36.0.txt
+++ b/Documentation/RelNotes/2.36.0.txt
@@ -9,6 +9,10 @@ Backward compatibility warts
  * "git name-rev --stdin" has been deprecated and issues a warning
    when used; use "git name-rev --annotate-stdin" instead.
 
+ * "git clone --filter=... --recurse-submodules" only makes the
+   top-level a partial clone, while submodules are fully cloned.  This
+   behaviour is changed to pass the same filter down to the submodules.
+
 
 Note to those who build from the source
 
@@ -65,6 +69,10 @@ Performance, Internal Implementation, Development Support etc.
    spawning "git checkout" in "rebase", and update code paths that are
    involved in the change.
 
+ * Messages "ort" merge backend prepares while dealing with conflicted
+   paths were unnecessarily confusing since it did not differentiate
+   inner merges and outer merges.
+
 
 Fixes since v2.35
 -----------------
@@ -205,6 +213,25 @@ Fixes since v2.35
    command line.  A "--no-graph" option has been added and resource
    leakage has been plugged.
 
+ * Error output given in response to an ambiguous object name has been
+   improved.
+   (merge 3a73c1dfaf ab/ambiguous-object-name later to maint).
+
+ * "git sparse-checkout" wants to work with per-worktree configuration,
+   but did not work well in a worktree attached to a bare repository.
+   (merge 3ce1138272 ds/sparse-checkout-requires-per-worktree-config later to maint).
+
+ * Setting core.untrackedCache to true failed to add the untracked
+   cache extension to the index.
+
+ * Workaround we have for versions of PCRE2 before their version 10.36
+   were in effect only for their versions newer than 10.36 by mistake,
+   which has been corrected.
+   (merge 97169fc361 rs/pcre-invalid-utf8-fix-fix later to maint).
+
+ * Document Taylor as a new member of Git PLC at SFC.  Welcome.
+   (merge e8d56ca863 tb/coc-plc-update later to maint).
+
  * 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).
@@ -227,3 +254,5 @@ Fixes since v2.35
    (merge d17294a05e ab/hash-object-leakfix later to maint).
    (merge b8403129d3 jd/t0015-modernize later to maint).
    (merge 332acc248d ds/mailmap later to maint).
+   (merge 04bf052eef ab/grep-patterntype later to maint).
+   (merge 6ee36364eb ab/diff-free-more later to maint).