diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-03-14 19:01:06 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 19:01:07 (GMT) |
commit | 7fb6aefd2aaffe66e614f7f7b83e5b7ab16d4806 (patch) | |
tree | ef9ef31f2e17a35974152e821b02bd2d8ae33ce6 /builtin/fetch.c | |
parent | 99321e327b4df8d9d6724cf26bab7429edbdb718 (diff) | |
parent | 27b42d045c06b6138555fef2b00d8d72220bc8be (diff) | |
download | git-7fb6aefd2aaffe66e614f7f7b83e5b7ab16d4806.zip git-7fb6aefd2aaffe66e614f7f7b83e5b7ab16d4806.tar.gz git-7fb6aefd2aaffe66e614f7f7b83e5b7ab16d4806.tar.bz2 |
Merge branch 'nd/parseopt-completion'
Teach parse-options API an option to help the completion script,
and make use of the mechanism in command line completion.
* nd/parseopt-completion: (45 commits)
completion: more subcommands in _git_notes()
completion: complete --{reuse,reedit}-message= for all notes subcmds
completion: simplify _git_notes
completion: don't set PARSE_OPT_NOCOMPLETE on --rerere-autoupdate
completion: use __gitcomp_builtin in _git_worktree
completion: use __gitcomp_builtin in _git_tag
completion: use __gitcomp_builtin in _git_status
completion: use __gitcomp_builtin in _git_show_branch
completion: use __gitcomp_builtin in _git_rm
completion: use __gitcomp_builtin in _git_revert
completion: use __gitcomp_builtin in _git_reset
completion: use __gitcomp_builtin in _git_replace
remote: force completing --mirror= instead of --mirror
completion: use __gitcomp_builtin in _git_remote
completion: use __gitcomp_builtin in _git_push
completion: use __gitcomp_builtin in _git_pull
completion: use __gitcomp_builtin in _git_notes
completion: use __gitcomp_builtin in _git_name_rev
completion: use __gitcomp_builtin in _git_mv
completion: use __gitcomp_builtin in _git_merge_base
...
Diffstat (limited to 'builtin/fetch.c')
-rw-r--r-- | builtin/fetch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index d32d946..6d73656 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -126,7 +126,7 @@ static struct option builtin_fetch_options[] = { N_("append to .git/FETCH_HEAD instead of overwriting")), OPT_STRING(0, "upload-pack", &upload_pack, N_("path"), N_("path to upload pack on remote end")), - OPT__FORCE(&force, N_("force overwrite of local branch")), + OPT__FORCE(&force, N_("force overwrite of local branch"), 0), OPT_BOOL('m', "multiple", &multiple, N_("fetch from multiple remotes")), OPT_SET_INT('t', "tags", &tags, |