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/checkout-index.c | |
| parent | Merge branch 'kb/maint-rebase-autosquash' (diff) | |
| parent | verify-tag: document --verbose (diff) | |
| download | tgif-20f84c8f56519b49fa91bb6cef8f8978c2ab4e09.tar.xz | |
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/checkout-index.c')
| -rw-r--r-- | builtin/checkout-index.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c index 65cbee0552..1ee3044307 100644 --- a/builtin/checkout-index.c +++ b/builtin/checkout-index.c @@ -217,9 +217,9 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) struct option builtin_checkout_index_options[] = { OPT_BOOLEAN('a', "all", &all, "checks out all files in the index"), - OPT_BOOLEAN('f', "force", &force, - "forces overwrite of existing files"), - OPT__QUIET(&quiet), + OPT__FORCE(&force, "forces overwrite of existing files"), + OPT__QUIET(&quiet, + "no warning for existing files and files not in index"), OPT_BOOLEAN('n', "no-create", ¬_new, "don't checkout new files"), { OPTION_CALLBACK, 'u', "index", &newfd, NULL, |