The seventeenth batch

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

diff --git a/Documentation/RelNotes/2.47.0.txt b/Documentation/RelNotes/2.47.0.txt
index ffc0c5c4a287b3a6dde9702fa874b353f8052cb2..86d2596bccb53cd12653c22775477f0724b186cb 100644 (file)
--- a/Documentation/RelNotes/2.47.0.txt
+++ b/Documentation/RelNotes/2.47.0.txt
@@ -65,6 +65,9 @@ UI, Workflows & Features
    to discourage its use by interactive users.  Add documentation to
    help tool writers.
 
+ * "git apply --3way" learned to take "--ours" and other options.
+
+
 Performance, Internal Implementation, Development Support etc.
 --------------------------------------------------------------
 
@@ -241,3 +244,4 @@ Fixes since v2.46
  * Other code cleanup, docfix, build fix, etc.
    (merge be10ac7037 jc/mailinfo-header-cleanup later to maint).
    (merge 9a36ea37ae jc/doc-skip-fetch-all-and-prefetch later to maint).
+   (merge 4460e052e0 jc/range-diff-lazy-setup later to maint).