Hello, I'm using git in environments with files having dos or unix line ending. I apply patches using 'git format-patch ... | git am ...'. A change in git-mailsplit in commit c2ca1d79 introduced a change in the default behaviour of git-mailsplit when splitting mbox patches. It makes dos line endings to unix line endings. With this behaviour it is impossible to apply patches. The following patches introduce the '--kepp-cr', '--no-keep-cr' parameter to git-am an an additional possibility to set '--keep-cr' via configuration for git-am. Also I added missing description for '--keep-cr' of git-mailsplit. Second round: I changed 'mailsplit.keep-cr' to 'mailsplit.keepcr' as suggested by Jakub and comment in the testcase. Third round: I moved configuration 'mailsplit.keepcr' to 'am.keepcr' because git-mailsplit can be used outside a git repository (thx Junio). Fourth round: I considered the replies from Junio and split up the patch introducing configuration am.keepcr in two. I introduced an '--no-keep-cr' to overwrite configuration. I removed git-mailsplit tests from the test suite, they only showed the behaviour when using dos line ending. I added some tests to show the correct behaviour in different situations using the new parameters and configuration. Stefan [PATCH 1/4] git-mailsplit: Show parameter '--keep-cr' in usage and documentation [PATCH 2/4] git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit. [PATCH 3/4] git-am: Add configuration am.keepcr and parameter --no-keep-cr to override configuration. [PATCH 4/4] git-am: Adding tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`. Documentation/config.txt | 7 +++ Documentation/git-am.txt | 9 +++- Documentation/git-mailsplit.txt | 5 ++- builtin-mailsplit.c | 2 +- git-am.sh | 32 ++++++++++--- t/t4253-am-keep-cr-dos.sh | 96 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 141 insertions(+), 10 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html