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

Re: [PATCH] config/fmt-merge-msg.txt: drop space in quote

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 27, 2020, 18:15 UTC
Message-ID
<xmqqk0wfgk6x.fsf@gitster.c.googlers.com>
In-Reply-To
<20200927140045.9668-1-martin.agren@gmail.com>
Martin Ågren <martin.agren@gmail.com> writes:
Show 5 quoted lines
> We document how `merge.suppressDest` can be used to omit " into <branch
> name>" from the title of the merge message. It is true that we omit the
> space character before "into", but that lone double quote character
> risks ending up on the wrong side of a line break, looking a bit out of
> place. This currently happens with, e.g., 80-character terminals.

The above correctly describes why the current text is written the way it is. The rationale for the change described above looks quite sensible.

Thanks.
Show 24 quoted lines
>
> Drop that leading quoted space. The result should be just as clear about
> how this option affects the formatted message.
>
> Signed-off-by: Martin Ågren <martin.agren@gmail.com>
> ---
>  On jc/fmt-merge-msg-suppress-destination.
>
>  Documentation/config/fmt-merge-msg.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/config/fmt-merge-msg.txt b/Documentation/config/fmt-merge-msg.txt
> index a8e8f74d0a..3fbf40e24f 100644
> --- a/Documentation/config/fmt-merge-msg.txt
> +++ b/Documentation/config/fmt-merge-msg.txt
> @@ -13,7 +13,7 @@ merge.suppressDest::
>  	By adding a glob that matches the names of integration
>  	branches to this multi-valued configuration variable, the
>  	default merge message computed for merges into these
> -	integration branches will omit " into <branch name>" from
> +	integration branches will omit "into <branch name>" from
>  	its title.
>  +
>  An element with an empty value can be used to clear the list
Previous: Martin Ågren
Message 2 of 2 in “config/fmt-merge-msg.txt: drop space in quote”
  1. config/fmt-merge-msg.txt: drop space in quoteMartin Ågren, Sep 27, 2020
  2. Junio C HamanoSep 27, 2020

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.