diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-24 14:12:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-24 14:12:12 -0700 |
| commit | df5384b09870c6ffdd80c620caa066b2f997ca20 (patch) | |
| tree | 61869c4e003760c97119d79b09aaf8ff3eda50bf /config.txt | |
| parent | ce447ab917ea7f6b852fee7dfb18e4b24acc6bef (diff) | |
| download | git-htmldocs-df5384b09870c6ffdd80c620caa066b2f997ca20.tar.gz | |
Autogenerated HTML docs for v2.4.4-488-gdf97e
Diffstat (limited to 'config.txt')
| -rw-r--r-- | config.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config.txt b/config.txt index 43bb53c04..3e37b93ed 100644 --- a/config.txt +++ b/config.txt @@ -769,6 +769,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' |