The seventeenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Sep 16, 2024 at 14:22 UTC
3969d78396e707c5a900dd5e15c365c54bef0283
1 file changed
+4
Documentation/RelNotes/2.47.0.txt
+4
@@ -65,6 +65,9 @@ UI, Workflows & Features
65
to discourage its use by interactive users. Add documentation to
66
help tool writers.
67
68
+ * "git apply --3way" learned to take "--ours" and other options.
69
+
70
+
71
Performance, Internal Implementation, Development Support etc.
72
--------------------------------------------------------------
73
@@ -241,3 +244,4 @@ Fixes since v2.46
244
* Other code cleanup, docfix, build fix, etc.
245
(merge be10ac7037 jc/mailinfo-header-cleanup later to maint).
246
(merge 9a36ea37ae jc/doc-skip-fetch-all-and-prefetch later to maint).
247
+ (merge 4460e052e0 jc/range-diff-lazy-setup later to maint).