diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-02-09 12:01:46 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-09 19:24:50 +0100 |
| commit | b8e9d6629426d2e955ffbf038a4386f5e0242be7 (patch) | |
| tree | 887d8142fd73f8abbf3d4efdd9d325272ffe5a25 /contrib | |
| parent | completion: use __gitcomp_builtin in _git_am (diff) | |
| download | git-b8e9d6629426d2e955ffbf038a4386f5e0242be7.tar.xz git-b8e9d6629426d2e955ffbf038a4386f5e0242be7.zip | |
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>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index eba482eb9c..2fd3fc999e 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -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 } |