diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-11-24 15:55:19 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-11-24 15:55:19 -0800 |
commit | 20f84c8f56519b49fa91bb6cef8f8978c2ab4e09 (patch) | |
tree | 506b6dc0c798465251dc065479158b045239a106 /builtin/apply.c | |
parent | cbcf0a6981687b31635d806f45e77188c54b7cfc (diff) | |
parent | 6e565345e87cf9b8da093e11492fe3a025007230 (diff) | |
download | git-20f84c8f56519b49fa91bb6cef8f8978c2ab4e09.tar.gz |
Merge branch 'rs/opt-help-text'
* rs/opt-help-text:
verify-tag: document --verbose
branch: improve --verbose description
archive: improve --verbose description
Describe various forms of "be quiet" using OPT__QUIET
add OPT__FORCE
add description parameter to OPT__QUIET
add description parameter to OPT__DRY_RUN
add description parameter to OPT__VERBOSE
Diffstat (limited to 'builtin/apply.c')
-rw-r--r-- | builtin/apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index f051e66dcc..96246e960f 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -3849,7 +3849,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_) "don't expect at least one line of context"), OPT_BOOLEAN(0, "reject", &apply_with_reject, "leave the rejected hunks in corresponding *.rej files"), - OPT__VERBOSE(&apply_verbosely), + OPT__VERBOSE(&apply_verbosely, "be verbose"), OPT_BIT(0, "inaccurate-eof", &options, "tolerate incorrectly detected missing new-line at the end of file", INACCURATE_EOF), |