add documentation for mailinfo.scissors and '--no-scissors'
Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nicolas Sebrecht committed
Sep 11, 2009 at 02:29 UTC
434a6db7dcf8688fe08098e218113c18b7c9aeaf
3 files changed
+10
-2
Documentation/git-am.txt
+4
-1
@@ -13,7 +13,7 @@ SYNOPSIS
13
[--3way] [--interactive] [--committer-date-is-author-date]
14
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
15
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
16
- [--reject] [-q | --quiet] [--scissors]
16
+ [--reject] [-q | --quiet] [--scissors | --no-scissors]
17
[<mbox> | <Maildir>...]
18
'git am' (--skip | --resolved | --abort)
19
@@ -44,6 +44,9 @@ OPTIONS
44
Remove everything in body before a scissors line (see
45
linkgit:git-mailinfo[1]).
46
47
+---no-scissors::
48
+ Ignore scissors lines (see linkgit:git-mailinfo[1]).
49
+
50
-q::
51
--quiet::
52
Be quiet. Only print error messages.
Documentation/git-mailinfo.txt
+5
@@ -62,6 +62,11 @@ This is useful if you want to begin your message in a discussion thread
62
with comments and suggestions on the message you are responding to, and to
63
conclude it with a patch submission, separating the discussion and the
64
beginning of the proposed commit log message with a scissors line.
65
++
66
+This can enabled by default with the configuration option mailinfo.scissors.
67
+
68
+--no-scissors::
69
+ Ignore scissors lines. Useful for overriding mailinfo.scissors settings.
70
71
<msg>::
72
The commit log message extracted from e-mail, usually
builtin-mailinfo.c
+1
-1
@@ -1004,7 +1004,7 @@ static int git_mailinfo_config(const char *var, const char *value, void *unused)
1004
}
1005
1006
static const char mailinfo_usage[] =
1007
- "git mailinfo [-k] [-u | --encoding=<encoding> | -n] [--scissors] msg patch < mail >info";
1007
+ "git mailinfo [-k] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] msg patch < mail >info";
1008
1009
int cmd_mailinfo(int argc, const char **argv, const char *prefix)
1010
{