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>
Nguyễn Thái Ngọc Duy committed
Feb 9, 2018 at 18:02 UTC
640c325b79a1ff6f23b7921c7de1023398962841
1 file changed
+7
-2
contrib/completion/git-completion.bash
+7
-2
@@ -1768,8 +1768,13 @@ _git_merge ()
1768
1769
case "$cur" in
1770
--*)
1771
- __gitcomp "$__git_merge_options
1772
- --rerere-autoupdate --no-rerere-autoupdate --abort --continue"
1771
+ __gitcomp_builtin merge "--rerere-autoupdate
1772
+ --no-rerere-autoupdate
1773
+ --no-commit --no-edit --no-ff
1774
+ --no-log --no-progress
1775
+ --no-squash --no-stat
1776
+ --no-verify-signatures
1777
+ "
1778
return
1779
esac
1780
__git_complete_refs