completion: complete merge-base options

johnkeeping · gitster · commit 85453fd1e36c · 2014-01-13T14:20:25.000-08:00
Signed-off-by: John Keeping &lt;john@keeping.me.uk&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
@@ -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)"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1499,6 +1499,12 @@ _git_mergetool ()`
`1499`	`1499`
`1500`	`1500`	`_git_merge_base ()`
`1501`	`1501`	`{`
	`1502`	`+ case "$cur" in`
	`1503`	`+ --*)`
	`1504`	`+ __gitcomp "--octopus --independent --is-ancestor --fork-point"`
	`1505`	`+ return`
	`1506`	`+ ;;`
	`1507`	`+ esac`
`1502`	`1508`	`__gitcomp_nl "$(__git_refs)"`
`1503`	`1509`	`}`
`1504`	`1510`