From 03b1c4285047d4418a2b599787d1ceb63b6cdd5c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 16 Sep 2024 14:34:01 -0700 Subject: [PATCH] Autogenerated HTML docs for v2.46.1-530-g3969d --- DecisionMaking.html | 2 +- MyFirstContribution.html | 2 +- MyFirstObjectWalk.html | 2 +- RelNotes/2.47.0.txt | 4 ++++ ReviewingGuidelines.html | 2 +- SubmittingPatches.html | 2 +- ToolsForGit.html | 2 +- everyday.html | 2 +- git-apply.html | 12 ++++++++++-- git-apply.txt | 9 ++++++++- git-remote-helpers.html | 2 +- howto/keep-canonical-history-correct.html | 4 ++-- howto/maintain-git.html | 4 ++-- howto/new-command.html | 4 ++-- howto/rebase-from-internal-branch.html | 4 ++-- howto/rebuild-from-update-hook.html | 4 ++-- howto/recover-corrupted-blob-object.html | 4 ++-- howto/recover-corrupted-object-harder.html | 4 ++-- howto/revert-a-faulty-merge.html | 4 ++-- howto/revert-branch-rebase.html | 4 ++-- howto/separating-topic-branches.html | 4 ++-- howto/setup-git-server-over-http.html | 4 ++-- howto/update-hook-example.html | 4 ++-- howto/use-git-daemon.html | 4 ++-- howto/using-merge-subtree.html | 4 ++-- howto/using-signed-tag-in-pull-request.html | 4 ++-- technical/api-error-handling.html | 2 +- technical/api-index.html | 2 +- technical/api-merge.html | 2 +- technical/api-parse-options.html | 2 +- technical/api-simple-ipc.html | 2 +- technical/api-trace2.html | 2 +- technical/bitmap-format.html | 2 +- technical/bundle-uri.html | 2 +- technical/hash-function-transition.html | 2 +- technical/long-running-process-protocol.html | 2 +- technical/multi-pack-index.html | 2 +- technical/pack-heuristics.html | 2 +- technical/parallel-checkout.html | 2 +- technical/partial-clone.html | 2 +- technical/platform-support.html | 2 +- technical/racy-git.html | 2 +- technical/scalar.html | 2 +- technical/send-pack-pipeline.html | 2 +- technical/shallow.html | 2 +- technical/trivial-merge.html | 2 +- technical/unit-tests.html | 2 +- 47 files changed, 81 insertions(+), 62 deletions(-) diff --git a/DecisionMaking.html b/DecisionMaking.html index 2d98a583..83022efc 100644 --- a/DecisionMaking.html +++ b/DecisionMaking.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/MyFirstContribution.html b/MyFirstContribution.html index a2c4d91c..67f06eac 100644 --- a/MyFirstContribution.html +++ b/MyFirstContribution.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html index 9d2494ab..fe0a42b9 100644 --- a/MyFirstObjectWalk.html +++ b/MyFirstObjectWalk.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/RelNotes/2.47.0.txt b/RelNotes/2.47.0.txt index ffc0c5c4..86d2596b 100644 --- a/RelNotes/2.47.0.txt +++ b/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). diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html index 2be70d61..f1190164 100644 --- a/ReviewingGuidelines.html +++ b/ReviewingGuidelines.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/SubmittingPatches.html b/SubmittingPatches.html index edc5cc75..6a021038 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/ToolsForGit.html b/ToolsForGit.html index d0b5dfa8..5a24a71d 100644 --- a/ToolsForGit.html +++ b/ToolsForGit.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/everyday.html b/everyday.html index e457c0ac..5b6cd9d2 100644 --- a/everyday.html +++ b/everyday.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/git-apply.html b/git-apply.html index 6e9c9b74..97341bf3 100644 --- a/git-apply.html +++ b/git-apply.html @@ -451,7 +451,8 @@ pre>code {

SYNOPSIS

-
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]
@@ -553,6 +554,13 @@ resolve.  This option implies the --index option unless the
 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
@@ -835,7 +843,7 @@ subdirectory is checked and (if possible) updated.
diff --git a/git-apply.txt b/git-apply.txt index 9cce68a3..dd4a61ef 100644 --- a/git-apply.txt +++ b/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=] [-R | --reverse] [--allow-binary-replacement | --binary] [--reject] [-z] [-p] [-C] [--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=:: Newer 'git diff' output has embedded 'index information' for each blob to help identify the original version that diff --git a/git-remote-helpers.html b/git-remote-helpers.html index ea0c89c8..fda200ea 100644 --- a/git-remote-helpers.html +++ b/git-remote-helpers.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index fecf7ba4..bf750f22 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -442,7 +442,7 @@ pre>code {
@@ -705,7 +705,7 @@ tip of your master again and redo the two merges:

diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 2d0891b7..23df4ba5 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -442,7 +442,7 @@ pre>code {
@@ -1242,7 +1242,7 @@ $ git update-ref -d $mf/ai/topic
diff --git a/howto/new-command.html b/howto/new-command.html index 89dcfbf9..4b30ea64 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -442,7 +442,7 @@ pre>code {
@@ -584,7 +584,7 @@ letter [PATCH 0/n].

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 183ad3c2..6f981c40 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -442,7 +442,7 @@ pre>code {
@@ -656,7 +656,7 @@ the #1' commit.

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 2e6ee319..0b5de77e 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -442,7 +442,7 @@ pre>code {
@@ -563,7 +563,7 @@ some locking mechanism for this.

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 8ecf56e9..6f964ee4 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -442,7 +442,7 @@ pre>code {
@@ -641,7 +641,7 @@ thing.

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 5b3b3966..314d5f25 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -442,7 +442,7 @@ pre>code {
@@ -967,7 +967,7 @@ int main(int argc, char **argv)
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index a7300c34..ea0a1639 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -442,7 +442,7 @@ pre>code {
@@ -829,7 +829,7 @@ P---o---o---M---x---x---W---x---M2
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index e789f8b6..0163d5ad 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -442,7 +442,7 @@ pre>code {
@@ -649,7 +649,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 76a62990..54633add 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -442,7 +442,7 @@ pre>code {
@@ -568,7 +568,7 @@ o---o"master"
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 13d4eae2..c5612316 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -442,7 +442,7 @@ pre>code {
@@ -882,7 +882,7 @@ help diagnosing the problem, but removes security checks.

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index a01988ce..ef98a59d 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -442,7 +442,7 @@ pre>code {
@@ -648,7 +648,7 @@ that JC can make non-fast-forward pushes on it.

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 50f801e2..b130dba6 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -442,7 +442,7 @@ pre>code {
@@ -524,7 +524,7 @@ a good practice to put the paths after a "--" separator.

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index c4c12108..a18ee504 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -442,7 +442,7 @@ pre>code {
@@ -554,7 +554,7 @@ to.

diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index d259df0b..ec0a55c2 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -442,7 +442,7 @@ pre>code {
@@ -712,7 +712,7 @@ as part of the merge commit.

diff --git a/technical/api-error-handling.html b/technical/api-error-handling.html index 97152a6c..61f14903 100644 --- a/technical/api-error-handling.html +++ b/technical/api-error-handling.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/api-index.html b/technical/api-index.html index c478b4ef..5fba1460 100644 --- a/technical/api-index.html +++ b/technical/api-index.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/api-merge.html b/technical/api-merge.html index 6398ca2d..db06ae95 100644 --- a/technical/api-merge.html +++ b/technical/api-merge.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html index cc206463..83c7bac2 100644 --- a/technical/api-parse-options.html +++ b/technical/api-parse-options.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/api-simple-ipc.html b/technical/api-simple-ipc.html index eec29c58..31592e4a 100644 --- a/technical/api-simple-ipc.html +++ b/technical/api-simple-ipc.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/api-trace2.html b/technical/api-trace2.html index 8c0d134b..919d2843 100644 --- a/technical/api-trace2.html +++ b/technical/api-trace2.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/bitmap-format.html b/technical/bitmap-format.html index 8a100a4b..4d7aadcc 100644 --- a/technical/bitmap-format.html +++ b/technical/bitmap-format.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/bundle-uri.html b/technical/bundle-uri.html index 45f92f9d..8bd0be54 100644 --- a/technical/bundle-uri.html +++ b/technical/bundle-uri.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/hash-function-transition.html b/technical/hash-function-transition.html index 9acd8776..d94dfb3d 100644 --- a/technical/hash-function-transition.html +++ b/technical/hash-function-transition.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/long-running-process-protocol.html b/technical/long-running-process-protocol.html index e876d4ef..99feaa2a 100644 --- a/technical/long-running-process-protocol.html +++ b/technical/long-running-process-protocol.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/multi-pack-index.html b/technical/multi-pack-index.html index 0038b070..4698ae8e 100644 --- a/technical/multi-pack-index.html +++ b/technical/multi-pack-index.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/pack-heuristics.html b/technical/pack-heuristics.html index 85b850c2..7ce58018 100644 --- a/technical/pack-heuristics.html +++ b/technical/pack-heuristics.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/parallel-checkout.html b/technical/parallel-checkout.html index 1fbd382f..0fc2bced 100644 --- a/technical/parallel-checkout.html +++ b/technical/parallel-checkout.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/partial-clone.html b/technical/partial-clone.html index 64932eb3..91e74437 100644 --- a/technical/partial-clone.html +++ b/technical/partial-clone.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/platform-support.html b/technical/platform-support.html index 8ac3a266..141a8eca 100644 --- a/technical/platform-support.html +++ b/technical/platform-support.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/racy-git.html b/technical/racy-git.html index 95c5b5a0..e7de857f 100644 --- a/technical/racy-git.html +++ b/technical/racy-git.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/scalar.html b/technical/scalar.html index c2f97a0c..8d8e8671 100644 --- a/technical/scalar.html +++ b/technical/scalar.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/send-pack-pipeline.html b/technical/send-pack-pipeline.html index 6403ff8b..adad1140 100644 --- a/technical/send-pack-pipeline.html +++ b/technical/send-pack-pipeline.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/shallow.html b/technical/shallow.html index 6c3a6841..a0f278f9 100644 --- a/technical/shallow.html +++ b/technical/shallow.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/trivial-merge.html b/technical/trivial-merge.html index 2614a4d6..8557edd9 100644 --- a/technical/trivial-merge.html +++ b/technical/trivial-merge.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/unit-tests.html b/technical/unit-tests.html index 9dfc58df..24da055b 100644 --- a/technical/unit-tests.html +++ b/technical/unit-tests.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
-- 2.11.4.GIT