diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-27 13:45:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-27 13:45:09 -0700 |
| commit | 2ce0aac108b9c935f3ac01e98478120df1f52ce1 (patch) | |
| tree | c624a2e9df8a9e31ef1dd84b201fd111c8b16680 /config.txt | |
| parent | f50c76bb490021aed8372077b0664d4b4c335959 (diff) | |
| download | git-htmldocs-2ce0aac108b9c935f3ac01e98478120df1f52ce1.tar.gz | |
Autogenerated HTML docs for v2.5.0
Diffstat (limited to 'config.txt')
| -rw-r--r-- | config.txt | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/config.txt b/config.txt index 3e37b93ed..43bb53c04 100644 --- a/config.txt +++ b/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' |