diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-25 02:55:19 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-25 02:55:19 +0300 |
| commit | 20f84c8f56519b49fa91bb6cef8f8978c2ab4e09 (patch) | |
| tree | 506b6dc0c798465251dc065479158b045239a106 /builtin/fetch.c | |
| parent | cbcf0a6981687b31635d806f45e77188c54b7cfc (diff) | |
| parent | 6e565345e87cf9b8da093e11492fe3a025007230 (diff) | |
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/fetch.c')
| -rw-r--r-- | builtin/fetch.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 4243ef0223..6bcce55c0c 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -43,8 +43,7 @@ static struct option builtin_fetch_options[] = { "append to .git/FETCH_HEAD instead of overwriting"), OPT_STRING(0, "upload-pack", &upload_pack, "PATH", "path to upload pack on remote end"), - OPT_BOOLEAN('f', "force", &force, - "force overwrite of local branch"), + OPT__FORCE(&force, "force overwrite of local branch"), OPT_BOOLEAN('m', "multiple", &multiple, "fetch from multiple remotes"), OPT_SET_INT('t', "tags", &tags, |