| 1 | `am.keepcr`:: |
| 2 | If true, linkgit:git-am[1] will call linkgit:git-mailsplit[1] |
| 3 | for patches in mbox format with parameter `--keep-cr`. In this |
| 4 | case linkgit:git-mailsplit[1] will |
| 5 | not remove `\r` from lines ending with `\r\n`. Can be overridden |
| 6 | by giving `--no-keep-cr` from the command line. |
| 7 | |
| 8 | `am.threeWay`:: |
| 9 | By default, linkgit:git-am[1] will fail if the patch does not |
| 10 | apply cleanly. When set to true, this setting tells |
| 11 | linkgit:git-am[1] to fall back on 3-way merge if the patch |
| 12 | records the identity of blobs it is supposed to apply to and we |
| 13 | have those blobs available locally (equivalent to giving the |
| 14 | `--3way` option from the command line). Defaults to `false`. |
| 15 | |
| 16 | `am.messageId`:: |
| 17 | Add a `Message-ID` trailer based on the email header to the |
| 18 | commit when using linkgit:git-am[1] (see |
| 19 | linkgit:git-interpret-trailers[1]). See also the `--message-id` |
| 20 | and `--no-message-id` options. |