diff options
| author | Nicolas Sebrecht <nicolas.s.dev@gmx.fr> | 2009-09-11 02:29:58 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-11 00:23:07 -0700 |
| commit | 434a6db7dcf8688fe08098e218113c18b7c9aeaf (patch) | |
| tree | c72b9bbe58e5347e882625f5f5a07e2e1ba38c5d | |
| parent | e019961d7f55ff76eff93d74e7705d6bd55218eb (diff) | |
| download | git-434a6db7dcf8688fe08098e218113c18b7c9aeaf.tar.gz git-434a6db7dcf8688fe08098e218113c18b7c9aeaf.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-am.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-mailinfo.txt | 5 | ||||
| -rw-r--r-- | builtin-mailinfo.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 87781f4a7..67ad5da9c 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] [--scissors] + [--reject] [-q | --quiet] [--scissors | --no-scissors] [<mbox> | <Maildir>...] 'git am' (--skip | --resolved | --abort) @@ -44,6 +44,9 @@ OPTIONS Remove everything in body before a scissors line (see linkgit:git-mailinfo[1]). +---no-scissors:: + Ignore scissors lines (see linkgit:git-mailinfo[1]). + -q:: --quiet:: Be quiet. Only print error messages. diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt index 823ab82b5..996c3fcc6 100644 --- a/Documentation/git-mailinfo.txt +++ b/Documentation/git-mailinfo.txt @@ -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 conclude it with a patch submission, separating the discussion and the 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>:: The commit log message extracted from e-mail, usually diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c index 7d22fd733..d498b1cd2 100644 --- a/builtin-mailinfo.c +++ b/builtin-mailinfo.c @@ -1004,7 +1004,7 @@ static int git_mailinfo_config(const char *var, const char *value, void *unused) } 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) { |