diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-10 14:08:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-09 14:40:03 -0700 |
| commit | 78fb67f31edbdcde3580f9abc1048f4630ef1bee (patch) | |
| tree | 432a434874a03202c3e1c0ae089741b5be205809 | |
| parent | f2633ebd766b7f5817ae0ec69060170bb9b1501f (diff) | |
| download | git-78fb67f31edbdcde3580f9abc1048f4630ef1bee.tar.gz git-78fb67f31edbdcde3580f9abc1048f4630ef1bee.tar.xz | |
apply: document --3way option
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-apply.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index afd2c9ae5..634b84e4b 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 SYNOPSIS -------- [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] [--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`. +-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>:: Newer 'git diff' output has embedded 'index information' for each blob to help identify the original version that |