]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6e9b010 f15e7cf)
Merge branch 'tb/pull-ff-rebase-autostash'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Jun 2017 00:18:13 +0000 (09:18 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Jun 2017 00:18:13 +0000 (09:18 +0900)
commit35898eafab5dfd4ebc9daf2f4e422a1d4771954b
tree78d6fc54b2b26faa195ace41e7e771a9fe445bcetree | snapshot
parent6e9b0108c6515510580da1698af893263f8cd7decommit | diff
parentf15e7cf5cc95cbfd0d05c260f75631781e290edccommit | diff
Merge branch 'tb/pull-ff-rebase-autostash'

"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
builtin/pull.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.