Fifth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 30, 2022 at 23:24 UTC
1bcf4f6271ad8c952739164d160e97efd579424f
1 file changed
+13
Documentation/RelNotes/2.37.0.txt
+13
@@ -30,6 +30,14 @@ UI, Workflows & Features
30
* "git remote -v" now shows the list-objects-filter used during
31
fetching from the remote, if available.
32
33
+ * With the new http.curloptResolve configuration, the CURLOPT_RESOLVE
34
+ mechanism that allows cURL based applications to use pre-resolved
35
+ IP addresses for the requests is exposed to the scripts.
36
+
37
+ * "git add -i" was rewritten in C some time ago and has been in
38
+ testing; the reimplementation is now exposed to general public by
39
+ default.
40
+
41
42
Performance, Internal Implementation, Development Support etc.
43
@@ -180,6 +188,11 @@ Fixes since v2.36
188
the safety.
189
(merge b9063afda1 cb/path-owner-check-with-sudo later to maint).
190
191
+ * The tests that ensured merges stop when interfering local changes
192
+ are present did not make sure that local changes are preserved; now
193
+ they do.
194
+ (merge 4b317450ce jc/t6424-failing-merge-preserve-local-changes later to maint).
195
+
196
* Other code cleanup, docfix, build fix, etc.
197
(merge e6b2582da3 cm/reftable-0-length-memset later to maint).
198
(merge 0b75e5bf22 ab/misc-cleanup later to maint).