completion: complete merge-base options
Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Keeping committed
Jan 11, 2014 at 14:27 UTC
85453fd1e36c581c1e6b7939e46badf2581837b3
1 file changed
+6
contrib/completion/git-completion.bash
+6
@@ -1499,6 +1499,12 @@ _git_mergetool ()
1499
1500
_git_merge_base ()
1501
{
1502
+ case "$cur" in
1503
+ --*)
1504
+ __gitcomp "--octopus --independent --is-ancestor --fork-point"
1505
+ return
1506
+ ;;
1507
+ esac
1508
__gitcomp_nl "$(__git_refs)"
1509
}
1510