mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
apply: document --3way option
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f2633ebd76
commit
78fb67f31e
|
@ -9,7 +9,7 @@ git-apply - Apply a patch to files and/or to the index
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
[verse]
|
[verse]
|
||||||
'git apply' [--stat] [--numstat] [--summary] [--check] [--index]
|
'git apply' [--stat] [--numstat] [--summary] [--check] [--index] [--3way]
|
||||||
[--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
|
[--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
|
||||||
[--allow-binary-replacement | --binary] [--reject] [-z]
|
[--allow-binary-replacement | --binary] [--reject] [-z]
|
||||||
[-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
|
[-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
|
||||||
|
@ -72,6 +72,15 @@ OPTIONS
|
||||||
cached data, apply the patch, and store the result in the index
|
cached data, apply the patch, and store the result in the index
|
||||||
without using the working tree. This implies `--index`.
|
without using the working tree. This implies `--index`.
|
||||||
|
|
||||||
|
-3::
|
||||||
|
--3way::
|
||||||
|
When the patch does not apply cleanly, fall back on 3-way merge if
|
||||||
|
the patch records the identity of blobs it is supposed to apply to,
|
||||||
|
and we have those blobs available locally, possibly leaving the
|
||||||
|
conflict markers in the files in the working tree for the user to
|
||||||
|
resolve. This option implies the `--index` option, and is incompatible
|
||||||
|
with the `--reject` and the `--cached` options.
|
||||||
|
|
||||||
--build-fake-ancestor=<file>::
|
--build-fake-ancestor=<file>::
|
||||||
Newer 'git diff' output has embedded 'index information'
|
Newer 'git diff' output has embedded 'index information'
|
||||||
for each blob to help identify the original version that
|
for each blob to help identify the original version that
|
||||||
|
|
Loading…
Reference in a new issue