diff options
| author | Stephen Boyd <bebarino@gmail.com> | 2009-06-16 15:33:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-18 11:54:48 -0700 |
| commit | 0e987a12fc1d481d81ad9c56f4714efb08667213 (patch) | |
| tree | 3558298ec717c32ddac1204e6c9f751ab0da4d38 /Documentation | |
| parent | 2e6a30ef8fbaedc5f2ee199d36f7256bb0cfdf1e (diff) | |
| download | git-0e987a12fc1d481d81ad9c56f4714efb08667213.tar.gz git-0e987a12fc1d481d81ad9c56f4714efb08667213.tar.xz | |
am, rebase: teach quiet option
git-am and git-rebase are talkative scripts. Teach them to be quiet when
told, allowing them to speak only when they fail or experience errors.
The quiet option is maintained when git-am or git-rebase fails to apply
a patch. This means subsequent --resolved, --continue, --skip, --abort
invocations will be quiet if the original invocation was quiet.
Drop a handful of >&2 redirection; the rest of the program sends all the
info messages to stdout, not to stderr.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-am.txt | 6 | ||||
| -rw-r--r-- | Documentation/git-rebase.txt | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 6d92cbee6..32e689b2b 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] [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] - [--reject] + [--reject] [-q | --quiet] [<mbox> | <Maildir>...] 'git am' (--skip | --resolved | --abort) @@ -39,6 +39,10 @@ OPTIONS --keep:: Pass `-k` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]). +-q:: +--quiet:: + Be quiet. Only print error messages. + -u:: --utf8:: Pass `-u` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]). diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 26f3b7b2b..db1b71d24 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -236,6 +236,10 @@ OPTIONS is used instead ('git-merge-recursive' when merging a single head, 'git-merge-octopus' otherwise). This implies --merge. +-q:: +--quiet:: + Be quiet. Implies --no-stat. + -v:: --verbose:: Be verbose. Implies --stat. |