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: http://git.ipfire.org/?a=commitdiff_plain;h=ba98a2f6604fd2f9107ca9aec7d9b25e10a9ad60;p=thirdparty%2Fgit.git

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