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' 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).
Stefan
Stefan-W. Hahn (3):
git-mailsplit: Show parameter '--keep-cr' in usage and documentation
git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit.
Adding test for `--keep-cr` for git-am.
Documentation/config.txt | 6 +++
Documentation/git-mailsplit.txt | 5 ++-
builtin-mailsplit.c | 2 +-
git-am.sh | 27 +++++++++++----
t/t4253-am-keep-cr-dos.sh | 68 +++++++++++++++++++++++++++++++++++++++
5 files changed, 99 insertions(+), 9 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