diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-15 22:28:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-15 22:28:39 -0700 |
| commit | 0248269de7cca134098c35330c96a84a39eca214 (patch) | |
| tree | 6a699c9f0efbe26f3f87b2a9f8b3d0e721b90f48 /git-apply.txt | |
| parent | b61a777e41bce40f57f77443aca23664309e215d (diff) | |
| download | git-htmldocs-0248269de7cca134098c35330c96a84a39eca214.tar.gz | |
Autogenerated HTML docs for v1.7.11.2-249-g31c79
Diffstat (limited to 'git-apply.txt')
| -rw-r--r-- | git-apply.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/git-apply.txt b/git-apply.txt index afd2c9ae5..634b84e4b 100644 --- a/git-apply.txt +++ b/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 |