The sixth batch

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

diff --git a/Documentation/RelNotes/2.39.0.txt b/Documentation/RelNotes/2.39.0.txt
index 8153661826dec0cf4776df2f1fdb2ab2523cb394..f8f739cb8768a7010db1e19eb3962b6459385b6c 100644 (file)
--- a/Documentation/RelNotes/2.39.0.txt
+++ b/Documentation/RelNotes/2.39.0.txt
@@ -50,6 +50,8 @@ Performance, Internal Implementation, Development Support etc.
  * Avoid false-positive from LSan whose assumption may be broken with
    higher optimization levels.
 
+ * Enable address and undefined sanitizer tasks at GitHub Actions CI.
+
 
 Fixes since v2.38
 -----------------
@@ -135,6 +137,18 @@ Fixes since v2.38
    corrected.
    (merge db84376f98 ab/grep-simplify-extended-expression later to maint).
 
+ * "git diff rev^!" did not show combined diff to go to the rev from
+   its parents.
+   (merge a79c6b6081 rs/diff-caret-bang-with-parents later to maint).
+
+ * Allow configuration files in "protected" scopes to include other
+   configuration files.
+   (merge ecec57b3c9 gc/bare-repo-discovery later to maint).
+
+ * Give a bit more diversity to macOS CI by using sha1dc in one of the
+   jobs (the other one tests Apple Common Crypto).
+   (merge 1ad5c3df35 jc/ci-osx-with-sha1dc later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge c34a6bd291 so/diff-merges-cleanup later to maint).
    (merge 5e7c8b75e7 ab/test-malloc-with-sanitize-leak later to maint).