зеркало из https://github.com/microsoft/git.git
completion: use __gitcomp_builtin in _git_apply
The new completable options are:
--3way
--allow-overlap
--build-fake-ancestor=
--directory
--exclude
--include
--index-info is no longer completable but that's because it's renamed to
--build-fake-ancestor in 26b2800768
(apply: get rid of --index-info in
favor of --build-fake-ancestor - 2007-09-17)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
be3ce6b250
Коммит
b8e9d66294
5
apply.c
5
apply.c
|
@ -4943,8 +4943,9 @@ int apply_parse_options(int argc, const char **argv,
|
|||
N_("make sure the patch is applicable to the current index")),
|
||||
OPT_BOOL(0, "cached", &state->cached,
|
||||
N_("apply a patch without touching the working tree")),
|
||||
OPT_BOOL(0, "unsafe-paths", &state->unsafe_paths,
|
||||
N_("accept a patch that touches outside the working area")),
|
||||
OPT_BOOL_F(0, "unsafe-paths", &state->unsafe_paths,
|
||||
N_("accept a patch that touches outside the working area"),
|
||||
PARSE_OPT_NOCOMPLETE),
|
||||
OPT_BOOL(0, "apply", force_apply,
|
||||
N_("also apply the patch (use with --stat/--summary/--check)")),
|
||||
OPT_BOOL('3', "3way", &state->threeway,
|
||||
|
|
|
@ -1134,14 +1134,7 @@ _git_apply ()
|
|||
return
|
||||
;;
|
||||
--*)
|
||||
__gitcomp "
|
||||
--stat --numstat --summary --check --index
|
||||
--cached --index-info --reverse --reject --unidiff-zero
|
||||
--apply --no-add --exclude=
|
||||
--ignore-whitespace --ignore-space-change
|
||||
--whitespace= --inaccurate-eof --verbose
|
||||
--recount --directory=
|
||||
"
|
||||
__gitcomp_builtin apply
|
||||
return
|
||||
esac
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче