]> git.neil.brown.name Git - git.git/commitdiff
git / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f24e079 f15e7cf)
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)
"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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.