From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Jan 2014 18:43:55 +0000 (-0800)
Subject: Merge branch 'jk/complete-merge-base'
X-Git-Tag: v1.9-rc1~24
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ba98a2f6604fd2f9107ca9aec7d9b25e10a9ad60?hp=-c

Merge branch 'jk/complete-merge-base'

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

ba98a2f6604fd2f9107ca9aec7d9b25e10a9ad60
diff --combined contrib/completion/git-completion.bash
index 8aaf214b7d,3c1a11f256..9525343fcd
--- a/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