From: John Keeping <john@keeping.me.uk>
Date: Sat, 11 Jan 2014 14:27:12 +0000 (+0000)
Subject: completion: complete merge-base options
X-Git-Tag: v1.9-rc1~24^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85453fd1e36c581c1e6b7939e46badf2581837b3;p=git

completion: complete merge-base options

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 4fe5ce31bd..e74d402423 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1499,6 +1499,12 @@ _git_mergetool ()
 
 _git_merge_base ()
 {
+	case "$cur" in
+	--*)
+		__gitcomp "--octopus --independent --is-ancestor --fork-point"
+		return
+		;;
+	esac
 	__gitcomp_nl "$(__git_refs)"
 }