@@ -267,6 +267,11 @@ Performance, Internal Implementation, Development Support etc.
267267 config.txt file but are described in another file that is included
268268 by it, which has been corrected.
269269
270+ * The test linter code has learned that the end of here-doc mark
271+ "EOF" can be quoted in a double-quote pair, not just in a
272+ single-quote pair.
273+
274+
270275Fixes since v2.18
271276-----------------
272277
@@ -556,6 +561,23 @@ Fixes since v2.18
556561 which has been fixed.
557562 (merge 9bf5d4c4e2 nd/config-core-checkstat-doc later to maint).
558563
564+ * Recent "git rebase -i" update started to write bogusly formatted
565+ author-script, with a matching broken reading code. These are
566+ fixed.
567+
568+ * Recent addition of "directory rename" heuristics to the
569+ merge-recursive backend makes the command susceptible to false
570+ positives and false negatives. In the context of "git am -3",
571+ which does not know about surrounding unmodified paths and thus
572+ cannot inform the merge machinery about the full trees involved,
573+ this risk is particularly severe. As such, the heuristic is
574+ disabled for "git am -3" to keep the machinery "more stupid but
575+ predictable".
576+
577+ * "git merge-base" in 2.19-rc1 has performance regression when the
578+ (experimental) commit-graph feature is in use, which has been
579+ mitigated.
580+
559581 * Code cleanup, docfix, build fix, etc.
560582 (merge aee9be2ebe sg/update-ref-stdin-cleanup later to maint).
561583 (merge 037714252f jc/clean-after-sanity-tests later to maint).
@@ -598,3 +620,4 @@ Fixes since v2.18
598620 (merge 79b04f9b60 sg/t3903-missing-fix later to maint).
599621 (merge 2745817028 sg/t3420-autostash-fix later to maint).
600622 (merge 7afb0d6777 sg/test-rebase-editor-fix later to maint).
623+ (merge 6c6ce21baa es/freebsd-iconv-portability later to maint).
0 commit comments