diff options
Diffstat (limited to 'third_party/git/Documentation/config/am.txt')
| -rw-r--r-- | third_party/git/Documentation/config/am.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/third_party/git/Documentation/config/am.txt b/third_party/git/Documentation/config/am.txt new file mode 100644 index 000000000000..5bcad2efb116 --- /dev/null +++ b/third_party/git/Documentation/config/am.txt @@ -0,0 +1,14 @@ +am.keepcr:: + If true, git-am will call git-mailsplit for patches in mbox format + with parameter `--keep-cr`. In this case git-mailsplit will + not remove `\r` from lines ending with `\r\n`. Can be overridden + 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]. |