From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Dec 2013 20:58:27 +0000 (-0800)
Subject: Merge branch 'jc/merge-base-reflog'
X-Git-Tag: v1.9-rc0~98
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07d406b742b577a39d7cbdacd76d0dde021ff788;p=git

Merge branch 'jc/merge-base-reflog'

Code the logic in "pull --rebase" that figures out a fork point
from reflog entries in C.

* jc/merge-base-reflog:
  merge-base: teach "--fork-point" mode
  merge-base: use OPT_CMDMODE and clarify the command line parsing
---

07d406b742b577a39d7cbdacd76d0dde021ff788