diff options
author | Martin Ågren <martin.agren@gmail.com> | 2020-09-27 16:00:45 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-09-27 14:22:41 -0700 |
commit | 10a758479ee6003862ca65a230cf1e992c9e12d8 (patch) | |
tree | 5d5f823e0fcf4120e93f77ba8302d838866ab7da | |
parent | fmt-merge-msg: allow merge destination to be omitted again (diff) | |
download | tgif-10a758479ee6003862ca65a230cf1e992c9e12d8.tar.xz |
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.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | Documentation/config/fmt-merge-msg.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 |