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/mv.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/mv.c')
| -rw-r--r-- | builtin/mv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/mv.c b/builtin/mv.c index cdbb09473c..93e8995d9e 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -55,8 +55,8 @@ int cmd_mv(int argc, const char **argv, const char *prefix) int i, newfd; int verbose = 0, show_only = 0, force = 0, ignore_errors = 0; struct option builtin_mv_options[] = { - OPT__DRY_RUN(&show_only), - OPT_BOOLEAN('f', "force", &force, "force move/rename even if target exists"), + OPT__DRY_RUN(&show_only, "dry run"), + OPT__FORCE(&force, "force move/rename even if target exists"), OPT_BOOLEAN('k', NULL, &ignore_errors, "skip move/rename errors"), OPT_END(), }; |