diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-02-09 18:01:48 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-02-09 10:24:50 -0800 |
| commit | 77afafb2e3c09323d434c1f8a193a17684b8f109 (patch) | |
| tree | 04ee2aa6f5eeb64634678890af230f04f3425dc0 /builtin/checkout.c | |
| parent | completion: use __gitcomp_builtin in _git_branch (diff) | |
| download | tgif-77afafb2e3c09323d434c1f8a193a17684b8f109.tar.xz | |
completion: use __gitcomp_builtin in _git_checkout
The new completable options are:
--ignore-other-worktrees
--progress
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 2a96358eb7..a6218024a6 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1118,9 +1118,12 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) 2), OPT_SET_INT('3', "theirs", &opts.writeout_stage, N_("checkout their version for unmerged files"), 3), - OPT__FORCE(&opts.force, N_("force checkout (throw away local modifications)"), 0), + OPT__FORCE(&opts.force, N_("force checkout (throw away local modifications)"), + PARSE_OPT_NOCOMPLETE), OPT_BOOL('m', "merge", &opts.merge, N_("perform a 3-way merge with the new branch")), - OPT_BOOL(0, "overwrite-ignore", &opts.overwrite_ignore, N_("update ignored files (default)")), + OPT_BOOL_F(0, "overwrite-ignore", &opts.overwrite_ignore, + N_("update ignored files (default)"), + PARSE_OPT_NOCOMPLETE), OPT_STRING(0, "conflict", &conflict_style, N_("style"), N_("conflict style (merge or diff3)")), OPT_BOOL('p', "patch", &opts.patch_mode, N_("select hunks interactively")), |