From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Fri, 9 Feb 2018 11:02:05 +0000 (+0700)
Subject: completion: use __gitcomp_builtin in _git_merge_base
X-Git-Tag: v2.17.0-rc0~7^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4429d8b27bea2a03b4ccc412a7c85439ada1124f;p=git

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>
---

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