undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add documentation for mailinfo.scissors and '--no-scissors'

Browse Source 
Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nicolas Sebrecht 2009-09-11 02:29:58 +02:00 committed by Junio C Hamano
parent e019961d7f
commit 434a6db7dc
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-am.txt
View File

@ -13,7 +13,7 @@ SYNOPSIS
[--3way] [--interactive] [--committer-date-is-author-date] [--3way] [--interactive] [--committer-date-is-author-date]
[--ignore-date] [--ignore-space-change | --ignore-whitespace] [--ignore-date] [--ignore-space-change | --ignore-whitespace]
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
[--reject] [-q | --quiet] [--scissors] [--reject] [-q | --quiet] [--scissors | --no-scissors]
[<mbox> | <Maildir>...] [<mbox> | <Maildir>...]
'git am' (--skip | --resolved | --abort) 'git am' (--skip | --resolved | --abort)
@ -44,6 +44,9 @@ OPTIONS
Remove everything in body before a scissors line (see Remove everything in body before a scissors line (see
linkgit:git-mailinfo[1]). linkgit:git-mailinfo[1]).
---no-scissors::
Ignore scissors lines (see linkgit:git-mailinfo[1]).
-q:: -q::
--quiet:: --quiet::
Be quiet. Only print error messages. Be quiet. Only print error messages.

5
Documentation/git-mailinfo.txt
View File

@ -62,6 +62,11 @@ 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 with comments and suggestions on the message you are responding to, and to
conclude it with a patch submission, separating the discussion and the conclude it with a patch submission, separating the discussion and the
beginning of the proposed commit log message with a scissors line. beginning of the proposed commit log message with a scissors line.
+
This can enabled by default with the configuration option mailinfo.scissors.
--no-scissors::
Ignore scissors lines. Useful for overriding mailinfo.scissors settings.
<msg>:: <msg>::
The commit log message extracted from e-mail, usually The commit log message extracted from e-mail, usually

2
builtin-mailinfo.c
View File

@ -1004,7 +1004,7 @@ static int git_mailinfo_config(const char *var, const char *value, void *unused)
} }
static const char mailinfo_usage[] = static const char mailinfo_usage[] =
"git mailinfo [-k] [-u | --encoding=<encoding> | -n] [--scissors] msg patch < mail >info"; "git mailinfo [-k] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] msg patch < mail >info";
int cmd_mailinfo(int argc, const char **argv, const char *prefix) int cmd_mailinfo(int argc, const char **argv, const char *prefix)
{ {