Skip to content

Commit 00b0199

Browse files
committed
Merge branch 'cc/doc-trailer-whitespace-rules'
Doc update. * cc/doc-trailer-whitespace-rules: Documentation: clarify whitespace rules for trailers
2 parents 0e2a476 + b46dd17 commit 00b0199

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Documentation/git-interpret-trailers.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,12 @@ non-whitespace lines before a line that starts with '---' (followed by a
6060
space or the end of the line). Such three minus signs start the patch
6161
part of the message. See also `--no-divider` below.
6262

63-
When reading trailers, there can be whitespaces after the
64-
token, the separator and the value. There can also be whitespaces
65-
inside the token and the value. The value may be split over multiple lines with
66-
each subsequent line starting with whitespace, like the "folding" in RFC 822.
63+
When reading trailers, there can be no whitespace before or inside the
64+
token, but any number of regular space and tab characters are allowed
65+
between the token and the separator. There can be whitespaces before,
66+
inside or after the value. The value may be split over multiple lines
67+
with each subsequent line starting with at least one whitespace, like
68+
the "folding" in RFC 822.
6769

6870
Note that 'trailers' do not follow and are not intended to follow many
6971
rules for RFC 822 headers. For example they do not follow

0 commit comments

Comments
 (0)