git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* [PATCH] config/fmt-merge-msg.txt: drop space in quote
@ 2020-09-27 14:00 Martin Ågren
  2020-09-27 18:15 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Martin Ågren @ 2020-09-27 14:00 UTC (permalink / raw)
  To: git; +Cc: Junio C Hamano

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.

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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] config/fmt-merge-msg.txt: drop space in quote
  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
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2020-09-27 18:15 UTC (permalink / raw)
  To: Martin Ågren; +Cc: git

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-09-27 18:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).