Skip to contentSkip to conversation

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

PATCH In review Martin Ågren 2 participants 2 messages Sep 27, 2020 Documentation

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 config/fmt-merge-msg.txt: drop space in quote

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.

---
On jc/fmt-merge-msg-suppress-destination.

 Documentation/config/fmt-merge-msg.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/config/fmt-merge-msg.txt +1 -1
index a8e8f74d0a..3fbf40e24f 100644
@@ -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
Signature · 1 line
2.28.0.277.g9b3c35fffd
#1 lore raw
Quoted 5 lines · Martin Ågren

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.

Quoted 24 lines

Drop that leading quoted space. The result should be just as clear about how this option affects the formatted message.

---
On jc/fmt-merge-msg-suppress-destination.

 Documentation/config/fmt-merge-msg.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/config/fmt-merge-msg.txt +1 -1
index a8e8f74d0a..3fbf40e24f 100644
@@ -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