Merge branch 'jc/merge-base-reflog'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2013 20:58:27 +0000 (12:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2013 20:58:27 +0000 (12:58 -0800)
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

Trivial merge