]> git.ipfire.org Git - thirdparty/git.git/blob - Documentation/config/am.txt
Merge branch 'jk/escaped-wildcard-dwim'
[thirdparty/git.git] / Documentation / config / am.txt
1 am.keepcr::
2 If true, git-am will call git-mailsplit for patches in mbox format
3 with parameter `--keep-cr`. In this case git-mailsplit will
4 not remove `\r` from lines ending with `\r\n`. Can be overridden
5 by giving `--no-keep-cr` from the command line.
6 See linkgit:git-am[1], linkgit:git-mailsplit[1].
7
8 am.threeWay::
9 By default, `git am` will fail if the patch does not apply cleanly. When
10 set to true, this setting tells `git am` to fall back on 3-way merge if
11 the patch records the identity of blobs it is supposed to apply to and
12 we have those blobs available locally (equivalent to giving the `--3way`
13 option from the command line). Defaults to `false`.
14 See linkgit:git-am[1].