summaryrefslogtreecommitdiffstats
path: root/git-interpret-trailers.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-09-17 15:45:52 -0700
committerJunio C Hamano <gitster@pobox.com>2018-09-17 15:45:52 -0700
commit980e61ec567f55c9247391052477e61a32d24548 (patch)
tree6fe236d0a6fd3ffa6a1be9a52219ed50b7dfcd19 /git-interpret-trailers.html
parenta68ff6db4d42f41cb49143a5423fbe50f539043e (diff)
downloadgit-htmldocs-980e61ec567f55c9247391052477e61a32d24548.tar.gz
Autogenerated HTML docs for v2.19.0-216-g2d3b1c
Diffstat (limited to 'git-interpret-trailers.html')
-rw-r--r--git-interpret-trailers.html17
1 files changed, 14 insertions, 3 deletions
diff --git a/git-interpret-trailers.html b/git-interpret-trailers.html
index e4b741477..921888c38 100644
--- a/git-interpret-trailers.html
+++ b/git-interpret-trailers.html
@@ -794,8 +794,9 @@ 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 <em>---</em>. Such three
-minus signs start the patch part of the message.</p></div>
+non-whitespace lines before a line that starts with <em>---</em> (followed by a
+space or the end of the line). Such three minus signs start the patch
+part of the message. See also <code>--no-divider</code> below.</p></div>
<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. The value may be split over multiple lines with
@@ -920,6 +921,16 @@ the encoding rules and probably many other rules.</p></div>
--unfold</code>.
</p>
</dd>
+<dt class="hdlist1">
+--no-divider
+</dt>
+<dd>
+<p>
+ Do not treat <code>---</code> as the end of the commit message. Use this
+ when you know your input contains just the commit message itself
+ (and not an email or the output of <code>git format-patch</code>).
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -1244,7 +1255,7 @@ $ chmod +x .git/hooks/commit-msg</code></pre>
<div id="footer">
<div id="footer-text">
Last updated
- 2018-08-17 15:20:20 PDT
+ 2018-09-17 15:45:24 PDT
</div>
</div>
</body>