threads / patch / 54312

patchconfig/fmt-merge-msg.txt: drop space in quote

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

## tl;dr

2 messages between Sep 27, 2020 and Sep 27, 2020. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Martin Ågren· Sep 27, 2020, 14:00 UTC · lore

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(-)
Show changes to Documentation/config/fmt-merge-msg.txt +1 −1
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
Junio C Hamano· Sep 27, 2020, 18:15 UTC · re: Martin Ågren · lore

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

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

← back to recent threads