completion: complete merge-base options

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 4fe5ce31bd99e5c5307761c947d4661241ec3c24..e74d4024233376dd8ed70cddc7708303ce4de21b 100644 (file)
--- 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)"
 }