diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-31 14:41:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-31 14:41:58 -0700 |
| commit | f2f28b10dcc3f853e652ebd6471d5a25bacb7b5a (patch) | |
| tree | 69770f134f3b8ed5a2071767403661ed82634a5f /git-interpret-trailers.html | |
| parent | 5c3af9ef805a7cca9e98a42a2dd9f986d88950a9 (diff) | |
| download | git-htmldocs-f2f28b10dcc3f853e652ebd6471d5a25bacb7b5a.tar.gz | |
Autogenerated HTML docs for v2.11.0-rc0
Diffstat (limited to 'git-interpret-trailers.html')
| -rw-r--r-- | git-interpret-trailers.html | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/git-interpret-trailers.html b/git-interpret-trailers.html index ee37aa08e..d9b707c7f 100644 --- a/git-interpret-trailers.html +++ b/git-interpret-trailers.html @@ -786,17 +786,19 @@ after the commit message part of the output, and, if there is no line with only spaces at the end of the commit message part, one blank line
will be added before the new trailer.</p></div>
<div class="paragraph"><p>Existing trailers are extracted from the input message by looking for
-a group of one or more lines that contain a colon (by default), where
-the group is preceded by one or more empty (or whitespace-only) lines.
+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.
+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 <em>---</em>. Such three
minus signs start the patch part of the message.</p></div>
-<div class="paragraph"><p>When reading trailers, there can be whitespaces before and after the
+<div class="paragraph"><p>When reading trailers, there can be whitespaces after the
token, the separator and the value. There can also be whitespaces
-inside the token and the value.</p></div>
+inside the token and the value. The value may be split over multiple lines with
+each subsequent line starting with whitespace, like the "folding" in RFC 822.</p></div>
<div class="paragraph"><p>Note that <em>trailers</em> do not follow and are not intended to follow many
-rules for RFC 822 headers. For example they do not follow the line
-folding rules, the encoding rules and probably many other rules.</p></div>
+rules for RFC 822 headers. For example they do not follow
+the encoding rules and probably many other rules.</p></div>
</div>
</div>
<div class="sect1">
@@ -1154,7 +1156,7 @@ $ chmod +x .git/hooks/commit-msg</code></pre> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2016-07-13 14:58:50 PDT
+Last updated 2016-10-31 14:39:16 PDT
</div>
</div>
</body>
|