From: Junio C Hamano <redacted>
Date: Tue, 13 Jun 2017 20:27:03 +0000 (-0700)
Subject: Merge branch 'tb/pull-ff-rebase-autostash' into maint
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=9e60e21e53a6a8be899f9834955017e0ff6e6906;p=git.git

Merge branch 'tb/pull-ff-rebase-autostash' into maint

"git pull --rebase --autostash" didn't auto-stash when the local history
fast-forwards to the upstream.

* tb/pull-ff-rebase-autostash:
  pull: ff --rebase --autostash works in dirty repo
---

9e60e21e53a6a8be899f9834955017e0ff6e6906