| Message ID | 20200927140045.9668-1-martin.agren@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 10a758479ee6003862ca65a230cf1e992c9e12d8 |
| Headers | show |
| Series | config/fmt-merge-msg.txt: drop space in quote | expand |
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
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
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(-)