]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/am.c
builtin-am: support --keep-cr, am.keepcr
authorPaul Tan <pyokagan@gmail.com>
Tue, 4 Aug 2015 13:51:48 +0000 (21:51 +0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Aug 2015 05:02:11 +0000 (22:02 -0700)
commit5d123a4017813540ad67656608c5d85e84cc8e5d
tree6b31517d6797916bd01ce1c961e189ba1e6687a5
parent702cbaad61a15b035fd022bae57403baeb324d82
builtin-am: support --keep-cr, am.keepcr

Since ad2c928 (git-am: Add command line parameter `--keep-cr` passing it
to git-mailsplit, 2010-02-27), git-am.sh supported the --keep-cr option
and would pass it to git-mailsplit.

Since e80d4cb (git-am: Add am.keepcr and --no-keep-cr to override it,
2010-02-27), git-am.sh supported the am.keepcr config setting, which
controls whether --keep-cr is on by default.

Re-implement the above in builtin/am.c.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/am.c