summaryrefslogtreecommitdiffstats
path: root/git-interpret-trailers.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-11-23 12:12:30 -0800
committerJunio C Hamano <gitster@pobox.com>2016-11-23 12:12:30 -0800
commitca7854917672d71605f949e8407a9670cd91f993 (patch)
tree8cbc5e9bf12815ae75356d82b3102d3077a6a30f /git-interpret-trailers.txt
parentcd1dbe737a97c3e6a6fd78f109141e614f7a763c (diff)
downloadgit-htmldocs-ca7854917672d71605f949e8407a9670cd91f993.tar.gz
Autogenerated HTML docs for v2.11.0-rc3
Diffstat (limited to 'git-interpret-trailers.txt')
-rw-r--r--git-interpret-trailers.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-interpret-trailers.txt b/git-interpret-trailers.txt
index e99bda6ad..09074c75a 100644
--- a/git-interpret-trailers.txt
+++ b/git-interpret-trailers.txt
@@ -49,7 +49,8 @@ will be added before the new trailer.
Existing trailers are extracted from the input message by looking for
a group of one or more lines that (i) are all trailers, or (ii) contains at
-least one Git-generated trailer and consists of at least 25% trailers.
+least one Git-generated or user-configured trailer and consists of at
+least 25% trailers.
The group must be preceded by one or more empty (or whitespace-only) lines.
The group must either be at the end of the message or be the last
non-whitespace lines before a line that starts with '---'. Such three