summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorStefan-W. Hahn <stefan.hahn@s-hahn.de>2010-02-27 14:20:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-28 19:07:49 (GMT)
commite80d4cbefce106506ec217f9ab279bcf0b84a2e9 (patch)
tree6eeb6b7f8c3478e0e7a9843501f4964dbeddd5e6 /Documentation/config.txt
parentad2c928001d2d94f2cbf3c75734061eb8fc4383c (diff)
downloadgit-e80d4cbefce106506ec217f9ab279bcf0b84a2e9.zip
git-e80d4cbefce106506ec217f9ab279bcf0b84a2e9.tar.gz
git-e80d4cbefce106506ec217f9ab279bcf0b84a2e9.tar.bz2
git-am: Add am.keepcr and --no-keep-cr to override it
This patch adds the configuration `am.keepcr` for git-am. It also adds `--no-keep-cr` parameter for git-am to give the possibility to override configuration from command line. Signed-off-by: Stefan-W. Hahn <stefan.hahn@s-hahn.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 664de6b..dcbbdad 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'