diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-24 10:55:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-24 10:55:24 -0700 |
| commit | 15dc5b5fb049bdf7abdbc610a5dec040c4d499bd (patch) | |
| tree | c787e85448802c968c62cd1b99f162174cb86c17 /Documentation/git-am.txt | |
| parent | f99a38c0121456822f8a9dfb7928eefceaa98201 (diff) | |
| download | git-15dc5b5fb049bdf7abdbc610a5dec040c4d499bd.tar.gz | |
Revert "git-am: add am.threeWay config variable"
This reverts commit d96a275b91bae1800cd43be0651e886e7e042a17.
It used to be possible to apply a patch series with "git am mbox"
and then only after seeing a failure, switch to three-way mode via
"git am -3" (no other options or arguments). The commit being
reverted broke this workflow.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index dbea6e7ae9..0d8ba48f79 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] - [--[no-]3way] [--interactive] [--committer-date-is-author-date] + [--3way] [--interactive] [--committer-date-is-author-date] [--ignore-date] [--ignore-space-change | --ignore-whitespace] [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet] @@ -90,13 +90,10 @@ default. You can use `--no-utf8` to override this. -3:: --3way:: ---no-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. `--no-3way` can be used to override - am.threeWay configuration variable. For more information, - see am.threeWay in linkgit:git-config[1]. + available locally. --ignore-space-change:: --ignore-whitespace:: |