Skip to content

Commit 03b1c42

Browse files
gitstergitster
committed
Autogenerated HTML docs for v2.46.1-530-g3969d
1 parent 210f01b commit 03b1c42

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+81
-62
lines changed

‎DecisionMaking.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>Decision-Making Process in the Git Project</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">

‎MyFirstContribution.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>My First Contribution to the Git Project</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">

‎MyFirstObjectWalk.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>My First Object Walk</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">

‎RelNotes/2.47.0.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ UI, Workflows & Features
6565
to discourage its use by interactive users. Add documentation to
6666
help tool writers.
6767

68+
* "git apply --3way" learned to take "--ours" and other options.
69+
70+
6871
Performance, Internal Implementation, Development Support etc.
6972
--------------------------------------------------------------
7073

@@ -241,3 +244,4 @@ Fixes since v2.46
241244
* Other code cleanup, docfix, build fix, etc.
242245
(merge be10ac7037 jc/mailinfo-header-cleanup later to maint).
243246
(merge 9a36ea37ae jc/doc-skip-fetch-all-and-prefetch later to maint).
247+
(merge 4460e052e0 jc/range-diff-lazy-setup later to maint).

‎ReviewingGuidelines.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>Reviewing Patches in the Git Project</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">

‎SubmittingPatches.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>Submitting Patches</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">

‎ToolsForGit.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>Tools for developing Git</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">

‎everyday.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>Everyday Git With 20 Commands Or So</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">

‎git-apply.html

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,8 @@ <h2 id="_name">NAME</h2>
451451
<h2 id="_synopsis">SYNOPSIS</h2>
452452
<div class="sectionbody">
453453
<div class="verseblock">
454-
<pre class="content"><em>git apply</em> [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]
454+
<pre class="content"><em>git apply</em> [--stat] [--numstat] [--summary] [--check]
455+
[--index | --intent-to-add] [--3way] [--ours | --theirs | --union]
455456
[--apply] [--no-add] [--build-fake-ancestor=&lt;file&gt;] [-R | --reverse]
456457
[--allow-binary-replacement | --binary] [--reject] [-z]
457458
[-p&lt;n&gt;] [-C&lt;n&gt;] [--inaccurate-eof] [--recount] [--cached]
@@ -553,6 +554,13 @@ <h2 id="_options">OPTIONS</h2>
553554
When used with the <code>--cached</code> option, any conflicts are left at higher stages
554555
in the cache.</p>
555556
</dd>
557+
<dt class="hdlist1">--ours</dt>
558+
<dt class="hdlist1">--theirs</dt>
559+
<dt class="hdlist1">--union</dt>
560+
<dd>
561+
<p>Instead of leaving conflicts in the file, resolve conflicts favouring
562+
our (or their or both) side of the lines. Requires --3way.</p>
563+
</dd>
556564
<dt class="hdlist1">--build-fake-ancestor=&lt;file&gt;</dt>
557565
<dd>
558566
<p>Newer <em>git diff</em> output has embedded <em>index information</em>
@@ -835,7 +843,7 @@ <h2 id="_git">GIT</h2>
835843
</div>
836844
<div id="footer">
837845
<div id="footer-text">
838-
Last updated 2023-10-23 14:43:46 -0700
846+
Last updated 2024-09-16 14:32:02 -0700
839847
</div>
840848
</div>
841849
</body>

‎git-apply.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ git-apply - Apply a patch to files and/or to the index
99
SYNOPSIS
1010
--------
1111
[verse]
12-
'git apply' [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]
12+
'git apply' [--stat] [--numstat] [--summary] [--check]
13+
[--index | --intent-to-add] [--3way] [--ours | --theirs | --union]
1314
[--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
1415
[--allow-binary-replacement | --binary] [--reject] [-z]
1516
[-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
@@ -92,6 +93,12 @@ OPTIONS
9293
When used with the `--cached` option, any conflicts are left at higher stages
9394
in the cache.
9495

96+
--ours::
97+
--theirs::
98+
--union::
99+
Instead of leaving conflicts in the file, resolve conflicts favouring
100+
our (or their or both) side of the lines. Requires --3way.
101+
95102
--build-fake-ancestor=<file>::
96103
Newer 'git diff' output has embedded 'index information'
97104
for each blob to help identify the original version that

‎git-remote-helpers.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>git-remote-helpers</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">

‎howto/keep-canonical-history-correct.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>Keep authoritative canonical history correct with git pull</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -705,7 +705,7 @@ <h1>Keep authoritative canonical history correct with git pull</h1>
705705
</div>
706706
<div id="footer">
707707
<div id="footer-text">
708-
Last updated 2024-09-14 09:09:57 -0700
708+
Last updated 2024-09-16 14:32:26 -0700
709709
</div>
710710
</div>
711711
</body>

‎howto/maintain-git.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to maintain Git</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -1242,7 +1242,7 @@ <h3 id="_preparing_a_merge_fix">Preparing a "merge-fix"</h3>
12421242
</div>
12431243
<div id="footer">
12441244
<div id="footer-text">
1245-
Last updated 2024-09-14 09:09:57 -0700
1245+
Last updated 2024-09-16 14:32:26 -0700
12461246
</div>
12471247
</div>
12481248
</body>

‎howto/new-command.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to integrate new subcommands</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -584,7 +584,7 @@ <h2 id="_integrating_a_command">Integrating a command</h2>
584584
</div>
585585
<div id="footer">
586586
<div id="footer-text">
587-
Last updated 2024-09-14 09:09:56 -0700
587+
Last updated 2024-09-16 14:32:25 -0700
588588
</div>
589589
</div>
590590
</body>

‎howto/rebase-from-internal-branch.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to rebase from an internal branch</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -656,7 +656,7 @@ <h1>How to rebase from an internal branch</h1>
656656
</div>
657657
<div id="footer">
658658
<div id="footer-text">
659-
Last updated 2024-09-14 09:09:57 -0700
659+
Last updated 2024-09-16 14:32:26 -0700
660660
</div>
661661
</div>
662662
</body>

‎howto/rebuild-from-update-hook.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to rebuild from update hook</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -563,7 +563,7 @@ <h1>How to rebuild from update hook</h1>
563563
</div>
564564
<div id="footer">
565565
<div id="footer-text">
566-
Last updated 2024-09-14 09:09:57 -0700
566+
Last updated 2024-09-16 14:32:26 -0700
567567
</div>
568568
</div>
569569
</body>

‎howto/recover-corrupted-blob-object.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to recover a corrupted blob object</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -641,7 +641,7 @@ <h1>How to recover a corrupted blob object</h1>
641641
</div>
642642
<div id="footer">
643643
<div id="footer-text">
644-
Last updated 2024-09-14 09:09:57 -0700
644+
Last updated 2024-09-16 14:32:26 -0700
645645
</div>
646646
</div>
647647
</body>

‎howto/recover-corrupted-object-harder.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to recover an object from scratch</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -967,7 +967,7 @@ <h2 id="_the_adventure_continues">The adventure continues&#8230;&#8203;</h2>
967967
</div>
968968
<div id="footer">
969969
<div id="footer-text">
970-
Last updated 2024-09-14 09:09:57 -0700
970+
Last updated 2024-09-16 14:32:26 -0700
971971
</div>
972972
</div>
973973
</body>

‎howto/revert-a-faulty-merge.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to revert a faulty merge</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -829,7 +829,7 @@ <h1>How to revert a faulty merge</h1>
829829
</div>
830830
<div id="footer">
831831
<div id="footer-text">
832-
Last updated 2024-09-14 09:09:57 -0700
832+
Last updated 2024-09-16 14:32:26 -0700
833833
</div>
834834
</div>
835835
</body>

‎howto/revert-branch-rebase.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to revert an existing commit</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -649,7 +649,7 @@ <h1>How to revert an existing commit</h1>
649649
</div>
650650
<div id="footer">
651651
<div id="footer-text">
652-
Last updated 2024-09-14 09:09:56 -0700
652+
Last updated 2024-09-16 14:32:25 -0700
653653
</div>
654654
</div>
655655
</body>

‎howto/separating-topic-branches.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to separate topic branches</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -568,7 +568,7 @@ <h1>How to separate topic branches</h1>
568568
</div>
569569
<div id="footer">
570570
<div id="footer-text">
571-
Last updated 2024-09-14 09:09:57 -0700
571+
Last updated 2024-09-16 14:32:25 -0700
572572
</div>
573573
</div>
574574
</body>

‎howto/setup-git-server-over-http.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to setup Git server over http</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -882,7 +882,7 @@ <h2 id="_troubleshooting">Troubleshooting:</h2>
882882
</div>
883883
<div id="footer">
884884
<div id="footer-text">
885-
Last updated 2024-09-14 09:09:57 -0700
885+
Last updated 2024-09-16 14:32:25 -0700
886886
</div>
887887
</div>
888888
</body>

‎howto/update-hook-example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to use the update hook</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -648,7 +648,7 @@ <h1>How to use the update hook</h1>
648648
</div>
649649
<div id="footer">
650650
<div id="footer-text">
651-
Last updated 2024-09-14 09:09:57 -0700
651+
Last updated 2024-09-16 14:32:25 -0700
652652
</div>
653653
</div>
654654
</body>

‎howto/use-git-daemon.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to use git-daemon</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -524,7 +524,7 @@ <h1>How to use git-daemon</h1>
524524
</div>
525525
<div id="footer">
526526
<div id="footer-text">
527-
Last updated 2024-09-14 09:09:57 -0700
527+
Last updated 2024-09-16 14:32:25 -0700
528528
</div>
529529
</div>
530530
</body>

‎howto/using-merge-subtree.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to use the subtree merge strategy</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-13</span>
445+
<span id="revdate">2024-09-16</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -554,7 +554,7 @@ <h2 id="_additional_tips">Additional tips</h2>
554554
</div>
555555
<div id="footer">
556556
<div id="footer-text">
557-
Last updated 2024-09-14 09:09:56 -0700
557+
Last updated 2024-09-16 14:32:25 -0700
558558
</div>
559559
</div>
560560
</body>

0 commit comments

Comments
 (0)