mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
git-apply: add --quiet flag
Replace OPT_VERBOSE with OPT_VERBOSITY. This adds a --quiet flag to "git apply" so the user can turn down the verbosity. Signed-off-by: Jerry Zhang <jerry@skydio.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
e773545c7f
commit
c21b8ae857
|
@ -16,7 +16,7 @@ SYNOPSIS
|
|||
[--ignore-space-change | --ignore-whitespace]
|
||||
[--whitespace=(nowarn|warn|fix|error|error-all)]
|
||||
[--exclude=<path>] [--include=<path>] [--directory=<root>]
|
||||
[--verbose] [--unsafe-paths] [<patch>...]
|
||||
[--verbose | --quiet] [--unsafe-paths] [<patch>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
@ -228,6 +228,11 @@ behavior:
|
|||
current patch being applied will be printed. This option will cause
|
||||
additional information to be reported.
|
||||
|
||||
-q::
|
||||
--quiet::
|
||||
Suppress stderr output. Messages about patch status and progress
|
||||
will not be printed.
|
||||
|
||||
--recount::
|
||||
Do not trust the line counts in the hunk headers, but infer them
|
||||
by inspecting the patch (e.g. after editing the patch without
|
||||
|
|
2
apply.c
2
apply.c
|
@ -5071,7 +5071,7 @@ int apply_parse_options(int argc, const char **argv,
|
|||
N_("leave the rejected hunks in corresponding *.rej files")),
|
||||
OPT_BOOL(0, "allow-overlap", &state->allow_overlap,
|
||||
N_("allow overlapping hunks")),
|
||||
OPT__VERBOSE(&state->apply_verbosity, N_("be verbose")),
|
||||
OPT__VERBOSITY(&state->apply_verbosity),
|
||||
OPT_BIT(0, "inaccurate-eof", options,
|
||||
N_("tolerate incorrectly detected missing new-line at the end of file"),
|
||||
APPLY_OPT_INACCURATE_EOF),
|
||||
|
|
Loading…
Reference in a new issue