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

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