From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Sep 2024 21:22:38 +0000 (-0700)
Subject: The seventeenth batch
X-Git-Tag: v2.47.0-rc0~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3969d78396e707c5a900dd5e15c365c54bef0283;p=thirdparty%2Fgit.git

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 ffc0c5c4a2..86d2596bcc 100644
--- 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).