git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Martin Ågren" <martin.agren@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] config/fmt-merge-msg.txt: drop space in quote
Date: Sun, 27 Sep 2020 11:15:34 -0700	[thread overview]
Message-ID: <xmqqk0wfgk6x.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200927140045.9668-1-martin.agren@gmail.com> ("Martin =?utf-8?Q?=C3=85gren=22's?= message of "Sun, 27 Sep 2020 16:00:45 +0200")

Martin Ågren <martin.agren@gmail.com> writes:

> 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.


>
> 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

      reply	other threads:[~2020-09-27 18:15 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-27 14:00 [PATCH] config/fmt-merge-msg.txt: drop space in quote Martin Ågren
2020-09-27 18:15 ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqk0wfgk6x.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=martin.agren@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).