diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-09-11 23:28:32 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-09-11 23:28:32 +0000 |
| commit | cf5b77307aade1e04785922a4be0f2026cfcec48 (patch) | |
| tree | 811c90d09d6c1d013af80ebaa2a6895905eb0ec9 /git-am.txt | |
| parent | c28068f42827f92c7c73c184e4fd11ceba0c73da (diff) | |
| download | git-htmldocs-cf5b77307aade1e04785922a4be0f2026cfcec48.tar.gz | |
Autogenerated HTML docs for v1.6.5-rc0-8-g434a
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-am.txt b/git-am.txt index 87781f4a7..67ad5da9c 100644 --- a/git-am.txt +++ b/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. |