| commit | 9e60e21e53a6a8be899f9834955017e0ff6e6906 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 Jun 2017 20:27:03 +0000 (13 13:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 Jun 2017 20:27:03 +0000 (13 13:27 -0700) | ||
| tree | 35299757de16941997a2dd7d80a1ad1db5ace825 | treesnapshot (tar.gz zip) |
| parent | f24e079cb6ecaa217e593c2d2620187044ba1b0d | commitdiff |
| parent | f15e7cf5cc95cbfd0d05c260f75631781e290edc | commitdiff |
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
"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