summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-02-09 18:02:04 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-02-09 10:24:52 -0800
commit640c325b79a1ff6f23b7921c7de1023398962841 (patch)
tree03be150be77423276f6a8d05ac3ecb476ac72092
parentcompletion: use __gitcomp_builtin in _git_ls_remote (diff)
downloadtgif-640c325b79a1ff6f23b7921c7de1023398962841.tar.xz
completion: use __gitcomp_builtin in _git_merge
New completable options are: --allow-unrelated-histories --message= --overwrite-ignore --signoff --strategy-option= --summary --verify The variable $__git_merge_options remains because _git_pull() still needs it. It will soon be gone after _git_pull() is updated. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--contrib/completion/git-completion.bash9
1 files changed, 7 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e22ea60bc8..4f598820cd 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1768,8 +1768,13 @@ _git_merge ()
case "$cur" in
--*)
- __gitcomp "$__git_merge_options
- --rerere-autoupdate --no-rerere-autoupdate --abort --continue"
+ __gitcomp_builtin merge "--rerere-autoupdate
+ --no-rerere-autoupdate
+ --no-commit --no-edit --no-ff
+ --no-log --no-progress
+ --no-squash --no-stat
+ --no-verify-signatures
+ "
return
esac
__git_complete_refs