diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-26 21:36:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-26 22:22:22 -0700 |
| commit | 017678b4f47dc1b2a6691631373c46daf8f63206 (patch) | |
| tree | cf2a657570db595a71a35f7820a80eb2ded84309 /Documentation | |
| parent | f43c97f5720f48598e59629f7dc9892d082d8b0e (diff) | |
| download | git-017678b4f47dc1b2a6691631373c46daf8f63206.tar.gz | |
am/mailinfo: Disable scissors processing by default
You can enable it by giving --scissors to "git am".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-am.txt | 17 | ||||
| -rw-r--r-- | Documentation/git-mailinfo.txt | 16 |
2 files changed, 21 insertions, 12 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index e6ab3dfa57..87781f4a77 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 --keep:: Pass `-k` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]). +-c:: +--scissors:: + Remove everything in body before a scissors line (see + linkgit:git-mailinfo[1]). + -q:: --quiet:: 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. diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt index 8d95aaa304..823ab82b5e 100644 --- a/Documentation/git-mailinfo.txt +++ b/Documentation/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. |