path: root/Documentation/git-am.txt
diff options
authorJunio C Hamano <>2009-08-27 04:36:05 (GMT)
committerJunio C Hamano <>2009-08-27 05:22:22 (GMT)
commit017678b4f47dc1b2a6691631373c46daf8f63206 (patch)
treecf2a657570db595a71a35f7820a80eb2ded84309 /Documentation/git-am.txt
parentf43c97f5720f48598e59629f7dc9892d082d8b0e (diff)
am/mailinfo: Disable scissors processing by default
You can enable it by giving --scissors to "git am". Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/git-am.txt')
1 files changed, 6 insertions, 11 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index e6ab3df..87781f4 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -13,7 +13,7 @@ SYNOPSIS
[--3way] [--interactive] [--committer-date-is-author-date]
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
- [--reject] [-q | --quiet]
+ [--reject] [-q | --quiet] [--scissors]
[<mbox> | <Maildir>...]
'git am' (--skip | --resolved | --abort)
@@ -39,6 +39,11 @@ OPTIONS
Pass `-k` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]).
+ Remove everything in body before a scissors line (see
+ linkgit:git-mailinfo[1]).
Be quiet. Only print error messages.
@@ -128,16 +133,6 @@ the commit, after stripping common prefix "[PATCH <anything>]".
The "Subject: " line is supposed to concisely describe what the
commit is about in one line of text.
-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. 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.
"From: " and "Subject: " lines starting the body override the respective
commit author name and title values taken from the headers.