Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
Documentation/git-interpret-trailers.txt | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
Show changes to Documentation/git-interpret-trailers.txt +9 −1
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index d6d9231..816dd65 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -64,10 +64,12 @@ folding rules, the encoding rules and probably many other rules.
OPTIONS
-------
---trim-empty::
+--[no-]trim-empty::
If the <value> part of any trailer contains only whitespace,
the whole trailer will be removed from the resulting message.
- This apply to existing trailers as well as new trailers.
+ This applies to existing trailers as well as new
+ trailers. This overrides a 'trailer.trimempty' configuration
+ variable.
--trailer <token>[(=|:)<value>]::
Specify a (<token>, <value>) pair that should be applied as a
@@ -77,6 +79,11 @@ OPTIONS
CONFIGURATION VARIABLES
-----------------------
+trailer.trimempty::
+ This option tells if by default trailers with an empty <value>
+ part should be trimmed or not. See also the '--[no-]trim-empty'
+ option above.
+
trailer.separators::
This option tells which characters are recognized as trailer
separators. By default only ':' is recognized as a trailer
--
2.2.1.313.gcc831f2
Christian Couder