undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apply: document --3way option

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-05-10 14:08:29 -07:00
parent f2633ebd76
commit 78fb67f31e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/git-apply.txt
View File

@ -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