Merge branch 'tb/pull-ff-rebase-autostash' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Jun 2017 20:27:03 +0000 (13:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Jun 2017 20:27:03 +0000 (13:27 -0700)
commit9e60e21...53a6a8be899f9834955017e0ff6e6906
tree3529975...de16941997a2dd7d80a1ad1db5ace825copy hash to clipboard (tree)
parentf24e079...b6ecaa217e593c2d2620187044ba1b0dcopy hash to clipboard (diff)
parentf15e7cf...cc95cbfd0d05c260f75631781e290edccopy hash to clipboard (diff)