completion: use __gitcomp_builtin in _git_merge_base

pclouds · gitster · commit 4429d8b27bea · 2018-02-09T10:24:52.000-08:00
The new completion option is --all.

Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -1798,7 +1798,7 @@ _git_merge_base ()`
`1798`	`1798`	`{`
`1799`	`1799`	`case "$cur" in`
`1800`	`1800`	`--*)`
`1801`		`- __gitcomp "--octopus --independent --is-ancestor --fork-point"`
	`1801`	`+ __gitcomp_builtin merge-base`
`1802`	`1802`	`return`
`1803`	`1803`	`;;`
`1804`	`1804`	`esac`