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/config.txt | |
parent | f99a38c0121456822f8a9dfb7928eefceaa98201 (diff) | |
download | git-15dc5b5fb049bdf7abdbc610a5dec040c4d499bd.tar.gz git-15dc5b5fb049bdf7abdbc610a5dec040c4d499bd.tar.xz |
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/config.txt')
-rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 3e37b93ed..43bb53c04 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -769,14 +769,6 @@ am.keepcr:: by giving '--no-keep-cr' from the command line. See linkgit:git-am[1], linkgit:git-mailsplit[1]. -am.threeWay:: - By default, `git am` will fail if the patch does not apply cleanly. When - set to true, this setting tells `git am` to 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 (equivalent to giving the `--3way` - option from the command line). Defaults to `false`. - See linkgit:git-am[1]. - apply.ignoreWhitespace:: When set to 'change', tells 'git apply' to ignore changes in whitespace, in the same way as the '--ignore-space-change' |