Skip to content

Commit df616b1

Browse files
jonathantanmygitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 60ef86a commit df616b1

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Documentation/git-interpret-trailers.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ will be added before the new trailer.
4949

5050
Existing trailers are extracted from the input message by looking for
5151
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.
5354
The group must be preceded by one or more empty (or whitespace-only) lines.
5455
The group must either be at the end of the message or be the last
5556
non-whitespace lines before a line that starts with '---'. Such three

0 commit comments

Comments
 (0)