diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-11 00:32:34 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-11 00:32:34 +0100 |
| commit | c505a850157961d2db4512d029753946d0591649 (patch) | |
| tree | 718529011f6b516554933451fad147341c3c3ca6 /Documentation/config.txt | |
| parent | Merge branch 'cp/add-u-pathspec' (diff) | |
| parent | git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr` (diff) | |
| download | git-c505a850157961d2db4512d029753946d0591649.tar.xz git-c505a850157961d2db4512d029753946d0591649.zip | |
Merge branch 'sh/am-keep-cr'
* sh/am-keep-cr:
git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`
git-am: Add am.keepcr and --no-keep-cr to override it
git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit
documentation: 'git-mailsplit --keep-cr' is not hidden anymore
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 7103172ed3..87a3512073 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -555,6 +555,13 @@ it will be treated as a shell command. For example, defining executed from the top-level directory of a repository, which may not necessarily be the current directory. +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 overrriden + by giving '--no-keep-cr' from the command line. + See linkgit:git-am[1], linkgit:git-mailsplit[1]. + apply.ignorewhitespace:: When set to 'change', tells 'git apply' to ignore changes in whitespace, in the same way as the '--ignore-space-change' |