git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH/RFC v3 2/4] git-am.txt: add configuration section in git am documentation

From
Torsten Bögershausen <tboegi@web.de>
Date
Jun 3, 2015, 05:50 UTC
Message-ID
<556E95AC.7040305@web.de>
In-Reply-To
<1433266446-2845-2-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr>
On 06/02/2015 07:34 PM, Remi Lespinet wrote:
Show 22 quoted lines
> []
> Signed-off-by: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
> ---
>   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.
Previous: Junio C HamanoNext: Remi Lespinet
Message 4 of 16 in “git-am.sh: fix initialization of the threeway variable”
  1. 1/4 git-am.sh: fix initialization of the threeway variableRemi Lespinet, Jun 2, 2015
  2. 2/4 git-am.txt: add configuration section in git am documentationRemi Lespinet, Jun 2, 2015
  3. Junio C HamanoJun 2, 2015
  4. Torsten BögershausenJun 3, 2015
  5. 2/4 git-am.txt: add configuration section in git am documentationRemi Lespinet, Jun 3, 2015
  6. Torsten BögershausenJun 4, 2015
  7. Matthieu MoyJun 3, 2015
  8. Junio C HamanoJun 3, 2015
  9. Remi LespinetJun 3, 2015
  10. Remi LespinetJun 4, 2015
  11. 3/4 t4150-am: refactor am -3 testsRemi Lespinet, Jun 2, 2015
  12. 4/4 git-am: add am.threeWay config variableRemi Lespinet, Jun 2, 2015
  13. Junio C HamanoJun 2, 2015
  14. Matthieu MoyJun 3, 2015
  15. 4/4 git-am: add am.threeWay config variableRemi Lespinet, Jun 3, 2015
  16. Junio C HamanoJun 2, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.