apply: document --3way option
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 10, 2012 at 14:08 UTC
78fb67f31edbdcde3580f9abc1048f4630ef1bee
1 file changed
+10
-1
Documentation/git-apply.txt
+10
-1
@@ -9,7 +9,7 @@ git-apply - Apply a patch to files and/or to the index
9
SYNOPSIS
10
--------
11
[verse]
12
-'git apply' [--stat] [--numstat] [--summary] [--check] [--index]
12
+'git apply' [--stat] [--numstat] [--summary] [--check] [--index] [--3way]
13
[--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
14
[--allow-binary-replacement | --binary] [--reject] [-z]
15
[-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
@@ -72,6 +72,15 @@ OPTIONS
72
cached data, apply the patch, and store the result in the index
73
without using the working tree. This implies `--index`.
74
75
+-3::
76
+--3way::
77
+ When the patch does not apply cleanly, fall back on 3-way merge if
78
+ the patch records the identity of blobs it is supposed to apply to,
79
+ and we have those blobs available locally, possibly leaving the
80
+ conflict markers in the files in the working tree for the user to
81
+ resolve. This option implies the `--index` option, and is incompatible
82
+ with the `--reject` and the `--cached` options.
83
+
84
--build-fake-ancestor=<file>::
85
Newer 'git diff' output has embedded 'index information'
86
for each blob to help identify the original version that