From: John Keeping <john@keeping.me.uk>
Date: Sat, 11 Jan 2014 14:27:12 GMT
Subject: [PATCH 1/2] completion: complete merge-base options
Message-ID: <8a66d7faa732647badcb7ac76c6e90ff7e694686.1389450433.git.john@keeping.me.uk>

Signed-off-by: John Keeping <john@keeping.me.uk>
---
 contrib/completion/git-completion.bash | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 4fe5ce3..e74d402 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)"
 }
 
-- 
1.8.5.226.g0d60d77