From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 27 Dec 2013 22:58:08 +0000 (-0800)
Subject: Merge branch 'jk/pull-rebase-using-fork-point'
X-Git-Tag: v1.9-rc0~52
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2b0a564e02528e006d23e3318d0d2869fb239425?hp=--cc

Merge branch 'jk/pull-rebase-using-fork-point'

* jk/pull-rebase-using-fork-point:
rebase: use reflog to find common base with upstream
pull: use merge-base --fork-point when appropriate
---

2b0a564e02528e006d23e3318d0d2869fb239425