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

Junio C Hamano committed Dec 27, 2013 at 14:58 UTC 2b0a564e02528e006d23e3318d0d2869fb239425

No changes.