From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Dec 2016 22:45:38 +0000 (-0800)
Subject: Merge branch 'jc/pull-rebase-ff'
X-Git-Tag: v2.12.0-rc0~122
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2fb11ec6c175e8a380d91daccc3bbf9fc5bbea8b?hp=2fb11ec6c175e8a380d91daccc3bbf9fc5bbea8b

Merge branch 'jc/pull-rebase-ff'

"git pull --rebase", when there is no new commits on our side since
we forked from the upstream, should be able to fast-forward without
invoking "git rebase", but it didn't.

* jc/pull-rebase-ff:
pull: fast-forward "pull --rebase=true"
---