summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJonathan Tan <jonathantanmy@google.com>2016-11-21 20:47:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-11-21 20:49:57 (GMT)
commitdf616b19b4a8633261f304450c9a3872ffe33ae0 (patch)
treea3d6d8b5d371595ee333b26da144445d0be71435 /Documentation
parent60ef86a16268bfb1efb28bcb3f1b646bfad1931c (diff)
downloadgit-df616b19b4a8633261f304450c9a3872ffe33ae0.zip
git-df616b19b4a8633261f304450c9a3872ffe33ae0.tar.gz
git-df616b19b4a8633261f304450c9a3872ffe33ae0.tar.bz2
doc: mention user-configured trailers
In commit 1462450 ("trailer: allow non-trailers in trailer block", 2016-10-21), functionality was added (and tested [1]) to allow non-trailer lines in trailer blocks, as long as those blocks contain at least one Git-generated or user-configured trailer, and consists of at least 25% trailers. The documentation was updated to mention this new functionality, but did not mention "user-configured trailer". Further update the documentation to also mention "user-configured trailer". [1] "with non-trailer lines mixed with a configured trailer" in t/t7513-interpret-trailers.sh Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-interpret-trailers.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index e99bda6..09074c7 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/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