diff options
| author | Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> | 2015-06-04 17:04:55 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-04 10:42:41 -0700 |
| commit | d96a275b91bae1800cd43be0651e886e7e042a17 (patch) | |
| tree | 8b59f9edfb9cef63cfb9288a8a3fc617aee6ecb3 /Documentation/config.txt | |
| parent | 8c8884ce97eed5ab27a8b6f9f54a6f3795eded19 (diff) | |
| download | git-d96a275b91bae1800cd43be0651e886e7e042a17.tar.gz git-d96a275b91bae1800cd43be0651e886e7e042a17.tar.xz | |
git-am: add am.threeWay config variable
Add the am.threeWay configuration variable to use the -3 or --3way
option of git am by default. When am.threeway is set and not desired
for a specific git am command, the --no-3way option can be used to
override it.
Signed-off-by: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
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, 8 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 2e5ceaf71..77ada666f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -761,6 +761,14 @@ 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' |