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>
Jonathan Tan committed
Nov 21, 2016 at 12:47 UTC
df616b19b4a8633261f304450c9a3872ffe33ae0
1 file changed
+2
-1
Documentation/git-interpret-trailers.txt
+2
-1
@@ -49,7 +49,8 @@ will be added before the new trailer.
49
50
Existing trailers are extracted from the input message by looking for
51
a group of one or more lines that (i) are all trailers, or (ii) contains at
52
-least one Git-generated trailer and consists of at least 25% trailers.
52
+least one Git-generated or user-configured trailer and consists of at
53
+least 25% trailers.
54
The group must be preceded by one or more empty (or whitespace-only) lines.
55
The group must either be at the end of the message or be the last
56
non-whitespace lines before a line that starts with '---'. Such three