Merge branch 'jk/complete-merge-base'

* jk/complete-merge-base:
completion: handle --[no-]fork-point options to git-rebase
completion: complete merge-base options

diff --combined contrib/completion/git-completion.bash
index 8aaf214b7da7b45cc4018c5faac8e08d772547b4,3c1a11f256400f279fcfd577250a243bc5134d0c..9525343fcd34ce5009fcfd9b2bf2c6356282e259
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1499,6 -1499,12 +1499,12 @@@ _git_mergetool (
  
  _git_merge_base ()
  {
+       case "$cur" in
+       --*)
+               __gitcomp "--octopus --independent --is-ancestor --fork-point"
+               return
+               ;;
+       esac
        __gitcomp_nl "$(__git_refs)"
  }
  
@@@ -1631,7 -1637,7 +1637,7 @@@ _git_rebase (
                        --preserve-merges --stat --no-stat
                        --committer-date-is-author-date --ignore-date
                        --ignore-whitespace --whitespace=
-                       --autosquash
+                       --autosquash --fork-point --no-fork-point
                        "
  
                return
@@@ -2007,7 -2013,6 +2013,7 @@@ _git_config (
                fetch.unpackLimit
                format.attach
                format.cc
 +              format.coverLetter
                format.headers
                format.numbered
                format.pretty