From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 May 2022 06:24:12 +0000 (-0700)
Subject: Fifth batch
X-Git-Tag: v2.37.0-rc0~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1bcf4f6271ad8c952739164d160e97efd579424f;p=thirdparty%2Fgit.git

Fifth batch

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

diff --git a/Documentation/RelNotes/2.37.0.txt b/Documentation/RelNotes/2.37.0.txt
index 061cea22d5..6aea2a2d60 100644
--- a/Documentation/RelNotes/2.37.0.txt
+++ b/Documentation/RelNotes/2.37.0.txt
@@ -30,6 +30,14 @@ UI, Workflows & Features
  * "git remote -v" now shows the list-objects-filter used during
    fetching from the remote, if available.
 
+ * With the new http.curloptResolve configuration, the CURLOPT_RESOLVE
+   mechanism that allows cURL based applications to use pre-resolved
+   IP addresses for the requests is exposed to the scripts.
+
+ * "git add -i" was rewritten in C some time ago and has been in
+   testing; the reimplementation is now exposed to general public by
+   default.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -180,6 +188,11 @@ Fixes since v2.36
    the safety.
    (merge b9063afda1 cb/path-owner-check-with-sudo later to maint).
 
+ * The tests that ensured merges stop when interfering local changes
+   are present did not make sure that local changes are preserved; now
+   they do.
+   (merge 4b317450ce jc/t6424-failing-merge-preserve-local-changes later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge e6b2582da3 cm/reftable-0-length-memset later to maint).
    (merge 0b75e5bf22 ab/misc-cleanup later to maint).