The eleventh 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 d7c23b17c9c2137399c066545d88b9cbcc8d5820..6b2c6bfcc7caa4a0fce2b905b1ea32184a33dbdc 100644 (file)
--- a/Documentation/RelNotes/2.36.0.txt
+++ b/Documentation/RelNotes/2.36.0.txt
@@ -67,6 +67,9 @@ UI, Workflows & Features
    flexible interface than the existing "--batch" or "--batch-check"
    modes, to allow different kinds of inquiries made.
 
+ * The level of verbose output from the ort backend during inner merge
+   has been aligned to that of the recursive backend.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -116,6 +119,9 @@ Performance, Internal Implementation, Development Support etc.
    balloon to use variadic macros unconditionally, to make it official
    that we now have a hard dependency on the feature.
 
+ * Makefile refactoring with a bit of suffixes rule stripping to
+   optimize the runtime overhead.
+
 
 Fixes since v2.35
 -----------------
@@ -279,6 +285,20 @@ Fixes since v2.35
    recorded the last level component of the branch name, which has
    been corrected.
 
+ * "git fetch" can make two separate fetches, but ref updates coming
+   from them were in two separate ref transactions under "--atomic",
+   which has been corrected.
+
+ * Check the return value from parse_tree_indirect() to turn segfaults
+   into calls to die().
+   (merge 8d2eaf649a gc/parse-tree-indirect-errors later to maint).
+
+ * Newer version of GPGSM changed its output in a backward
+   incompatible way to break our code that parses its output.  It also
+   added more processes our tests need to kill when cleaning up.
+   Adjustments have been made to accommodate these changes.
+   (merge b0b70d54c4 fs/gpgsm-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).
@@ -303,3 +323,4 @@ Fixes since v2.35
    (merge 332acc248d ds/mailmap later to maint).
    (merge 04bf052eef ab/grep-patterntype later to maint).
    (merge 6ee36364eb ab/diff-free-more later to maint).
+   (merge 63a36017fe nj/read-tree-doc-reffix later to maint).