Autogenerated HTML docs for v2.46.1-530-g3969d

Author: gitster

DecisionMaking.html

@@ -442,7 +442,7 @@
 <div id="header">
 <h1>Decision-Making Process in the Git Project</h1>
 <div class="details">
-<span id="revdate">2024-09-13</span>
+<span id="revdate">2024-09-16</span>
 </div>
 </div>
 <div id="content">

MyFirstContribution.html

@@ -442,7 +442,7 @@
 <div id="header">
 <h1>My First Contribution to the Git Project</h1>
 <div class="details">
-<span id="revdate">2024-09-13</span>
+<span id="revdate">2024-09-16</span>
 </div>
 </div>
 <div id="content">

MyFirstObjectWalk.html

@@ -442,7 +442,7 @@
 <div id="header">
 <h1>My First Object Walk</h1>
 <div class="details">
-<span id="revdate">2024-09-13</span>
+<span id="revdate">2024-09-16</span>
 </div>
 </div>
 <div id="content">

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).

ReviewingGuidelines.html

@@ -442,7 +442,7 @@
 <div id="header">
 <h1>Reviewing Patches in the Git Project</h1>
 <div class="details">
-<span id="revdate">2024-09-13</span>
+<span id="revdate">2024-09-16</span>
 </div>
 </div>
 <div id="content">

SubmittingPatches.html

@@ -442,7 +442,7 @@
 <div id="header">
 <h1>Submitting Patches</h1>
 <div class="details">
-<span id="revdate">2024-09-13</span>
+<span id="revdate">2024-09-16</span>
 </div>
 </div>
 <div id="content">

ToolsForGit.html

@@ -442,7 +442,7 @@
 <div id="header">
 <h1>Tools for developing Git</h1>
 <div class="details">
-<span id="revdate">2024-09-13</span>
+<span id="revdate">2024-09-16</span>
 </div>
 </div>
 <div id="content">

everyday.html

@@ -442,7 +442,7 @@
 <div id="header">
 <h1>Everyday Git With 20 Commands Or So</h1>
 <div class="details">
-<span id="revdate">2024-09-13</span>
+<span id="revdate">2024-09-16</span>
 </div>
 </div>
 <div id="content">

git-apply.html

@@ -451,7 +451,8 @@ <h2 id="_name">NAME</h2>
 <h2 id="_synopsis">SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<pre class="content"><em>git apply</em> [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]
+<pre class="content"><em>git apply</em> [--stat] [--numstat] [--summary] [--check]
+          [--index | --intent-to-add] [--3way] [--ours | --theirs | --union]
           [--apply] [--no-add] [--build-fake-ancestor=&lt;file&gt;] [-R | --reverse]
           [--allow-binary-replacement | --binary] [--reject] [-z]
           [-p&lt;n&gt;] [-C&lt;n&gt;] [--inaccurate-eof] [--recount] [--cached]
@@ -553,6 +554,13 @@ <h2 id="_options">OPTIONS</h2>
 When used with the <code>--cached</code> option, any conflicts are left at higher stages
 in the cache.</p>
 </dd>
+<dt class="hdlist1">--ours</dt>
+<dt class="hdlist1">--theirs</dt>
+<dt class="hdlist1">--union</dt>
+<dd>
+<p>Instead of leaving conflicts in the file, resolve conflicts favouring
+our (or their or both) side of the lines. Requires --3way.</p>
+</dd>
 <dt class="hdlist1">--build-fake-ancestor=&lt;file&gt;</dt>
 <dd>
 <p>Newer <em>git diff</em> output has embedded <em>index information</em>
@@ -835,7 +843,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2023-10-23 14:43:46 -0700
+Last updated 2024-09-16 14:32:02 -0700
 </div>
 </div>
 </body>

git-apply.txt

@@ -9,7 +9,8 @@ git-apply - Apply a patch to files and/or to the index
 SYNOPSIS
 --------
 [verse]
-'git apply' [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]
+'git apply' [--stat] [--numstat] [--summary] [--check]
+	  [--index | --intent-to-add] [--3way] [--ours | --theirs | --union]
 	  [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
 	  [--allow-binary-replacement | --binary] [--reject] [-z]
 	  [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
@@ -92,6 +93,12 @@ OPTIONS
 	When used with the `--cached` option, any conflicts are left at higher stages
 	in the cache.
 
+--ours::
+--theirs::
+--union::
+	Instead of leaving conflicts in the file, resolve conflicts favouring
+	our (or their or both) side of the lines. Requires --3way.
+
 --build-fake-ancestor=<file>::
 	Newer 'git diff' output has embedded 'index information'
 	for each blob to help identify the original version that