summaryrefslogtreecommitdiffstats
path: root/git-mailinfo.txt
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.txt
parent35b47ca5285a4059792ba937f8e09b2ab4a7adf4 (diff)
downloadgit-htmldocs-c28068f42827f92c7c73c184e4fd11ceba0c73da.tar.gz
Autogenerated HTML docs for v1.6.5-rc0
Diffstat (limited to 'git-mailinfo.txt')
-rw-r--r--git-mailinfo.txt16
1 files changed, 15 insertions, 1 deletions
diff --git a/git-mailinfo.txt b/git-mailinfo.txt
index 8d95aaa30..823ab82b5 100644
--- a/git-mailinfo.txt
+++ b/git-mailinfo.txt
@@ -8,7 +8,7 @@ git-mailinfo - Extracts patch and authorship from a single e-mail message
SYNOPSIS
--------
-'git mailinfo' [-k] [-u | --encoding=<encoding> | -n] <msg> <patch>
+'git mailinfo' [-k] [-u | --encoding=<encoding> | -n] [--scissors] <msg> <patch>
DESCRIPTION
@@ -49,6 +49,20 @@ conversion, even with this flag.
-n::
Disable all charset re-coding of the metadata.
+--scissors::
+ Remove everything in body before a scissors line. A line that
+ mainly consists of scissors (either ">8" or "8<") 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.
++
+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.
+
<msg>::
The commit log message extracted from e-mail, usually
except the title line which comes from e-mail Subject.