summaryrefslogtreecommitdiffstats
path: root/git-mailinfo.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-09-08 00:55:23 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-09-08 00:55:23 +0000
commitc28068f42827f92c7c73c184e4fd11ceba0c73da (patch)
tree2ea9bf073e1f773ca1fcfb8bf76ec28ead3687e4 /git-mailinfo.html
parent35b47ca5285a4059792ba937f8e09b2ab4a7adf4 (diff)
downloadgit-htmldocs-c28068f42827f92c7c73c184e4fd11ceba0c73da.tar.gz
Autogenerated HTML docs for v1.6.5-rc0
Diffstat (limited to 'git-mailinfo.html')
-rw-r--r--git-mailinfo.html22
1 files changed, 20 insertions, 2 deletions
diff --git a/git-mailinfo.html b/git-mailinfo.html
index aac9df2c5..6d60c9508 100644
--- a/git-mailinfo.html
+++ b/git-mailinfo.html
@@ -320,7 +320,7 @@ git-mailinfo(1) Manual Page
</div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<div class="para"><p><em>git mailinfo</em> [-k] [-u | --encoding=&lt;encoding&gt; | -n] &lt;msg&gt; &lt;patch&gt;</p></div>
+<div class="para"><p><em>git mailinfo</em> [-k] [-u | --encoding=&lt;encoding&gt; | -n] [--scissors] &lt;msg&gt; &lt;patch&gt;</p></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
@@ -380,6 +380,24 @@ conversion, even with this flag.</p></div>
</p>
</dd>
<dt>
+--scissors
+</dt>
+<dd>
+<p>
+ Remove everything in body before a scissors line. A line that
+ mainly consists of scissors (either "&gt;8" or "8&lt;") and perforation
+ (dash "-") marks is called a scissors line, and is used to request
+ the reader to cut the message at that line. If such a line
+ appears in the body of the message before the patch, everything
+ before it (including the scissors line itself) is ignored when
+ this option is used.
+</p>
+<div class="para"><p>This is useful if you want to begin your message in a discussion thread
+with comments and suggestions on the message you are responding to, and to
+conclude it with a patch submission, separating the discussion and the
+beginning of the proposed commit log message with a scissors line.</p></div>
+</dd>
+<dt>
&lt;msg&gt;
</dt>
<dd>
@@ -413,7 +431,7 @@ Junio C Hamano &lt;gitster@pobox.com&gt;</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-07-01 02:30:55 UTC
+Last updated 2009-09-08 00:55:00 UTC
</div>
</div>
</body>