Re: [PATCH/RFC v3 2/4] git-am.txt: add configuration section in git am documentation
From: Torsten Bögershausen <hidden>
Date: 2016-06-15 23:05:07
On 06/02/2015 07:34 PM, Remi Lespinet wrote:
quoted hunk ↗ jump to hunk
[] Signed-off-by: Remi Lespinet <redacted> --- Documentation/git-am.txt | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 0d8ba48..d412f6b 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt@@ -24,6 +24,16 @@ Splits mail messages in a mailbox into commit log message, authorship information and patches, and applies them to the current branch. +CONFIGURATION +------------- + +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 overridden + by giving '--no-keep-cr' from the command line.
(This documentation assumes that am.keepcr is true) Would it be clearer to put the "overridden" into one line and write like this: Can be overridden by giving '--no-keep-cr' or '--keep-cr' from the command line.