summaryrefslogtreecommitdiff
path: root/builtin/replace.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-03-14 19:01:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-14 19:01:07 (GMT)
commit7fb6aefd2aaffe66e614f7f7b83e5b7ab16d4806 (patch)
treeef9ef31f2e17a35974152e821b02bd2d8ae33ce6 /builtin/replace.c
parent99321e327b4df8d9d6724cf26bab7429edbdb718 (diff)
parent27b42d045c06b6138555fef2b00d8d72220bc8be (diff)
downloadgit-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/replace.c')
-rw-r--r--builtin/replace.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/replace.c b/builtin/replace.c
index 9f01f3f..482f120 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -439,7 +439,8 @@ int cmd_replace(int argc, const char **argv, const char *prefix)
OPT_CMDMODE('d', "delete", &cmdmode, N_("delete replace refs"), MODE_DELETE),
OPT_CMDMODE('e', "edit", &cmdmode, N_("edit existing object"), MODE_EDIT),
OPT_CMDMODE('g', "graft", &cmdmode, N_("change a commit's parents"), MODE_GRAFT),
- OPT_BOOL('f', "force", &force, N_("replace the ref if it exists")),
+ OPT_BOOL_F('f', "force", &force, N_("replace the ref if it exists"),
+ PARSE_OPT_NOCOMPLETE),
OPT_BOOL(0, "raw", &raw, N_("do not pretty-print contents for --edit")),
OPT_STRING(0, "format", &format, N_("format"), N_("use this format")),
OPT_END()