diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-02-09 12:02:05 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-02-09 19:24:52 +0100 |
commit | 4429d8b27bea2a03b4ccc412a7c85439ada1124f (patch) | |
tree | be09b38ec4e76ac2c79d727f253060993e7ca1ef /contrib | |
parent | completion: use __gitcomp_builtin in _git_merge (diff) | |
download | git-4429d8b27bea2a03b4ccc412a7c85439ada1124f.tar.xz git-4429d8b27bea2a03b4ccc412a7c85439ada1124f.zip |
completion: use __gitcomp_builtin in _git_merge_base
The new completion option is --all.
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 4f598820cd..b192a5c0a1 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1798,7 +1798,7 @@ _git_merge_base () { case "$cur" in --*) - __gitcomp "--octopus --independent --is-ancestor --fork-point" + __gitcomp_builtin merge-base return ;; esac |