path: root/Documentation/git-apply.txt
diff options
authorJunio C Hamano <>2012-05-10 21:08:29 (GMT)
committerJunio C Hamano <>2012-07-09 21:40:03 (GMT)
commit78fb67f31edbdcde3580f9abc1048f4630ef1bee (patch)
tree432a434874a03202c3e1c0ae089741b5be205809 /Documentation/git-apply.txt
parentf2633ebd766b7f5817ae0ec69060170bb9b1501f (diff)
apply: document --3way option
Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/git-apply.txt')
1 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index afd2c9a..634b84e 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -9,7 +9,7 @@ git-apply - Apply a patch to files and/or to the index
-'git apply' [--stat] [--numstat] [--summary] [--check] [--index]
+'git apply' [--stat] [--numstat] [--summary] [--check] [--index] [--3way]
[--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
[--allow-binary-replacement | --binary] [--reject] [-z]
[-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
without using the working tree. This implies `--index`.
+ 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.
Newer 'git diff' output has embedded 'index information'
for each blob to help identify the original version that