Merge branch 'jk/complete-merge-base'
commitba98a2f6604fd2f9107ca9aec7d9b25e10a9ad60
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:43:55 +0000 (27 10:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:43:55 +0000 (27 10:43 -0800)
tree49453cb22fd186eb27b69219622c83ce33b91052
parentc9e8c1aa3fdcc7b55d1e7f2d400e0d16758f6b77
parent4310e328d416be00e58e90b69ed3b62f5845c744
Merge branch 'jk/complete-merge-base'

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