| commit | 35898eafab5dfd4ebc9daf2f4e422a1d4771954b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Jun 2017 00:18:13 +0000 (5 09:18 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Jun 2017 00:18:13 +0000 (5 09:18 +0900) | ||
| tree | 78d6fc54b2b26faa195ace41e7e771a9fe445bce | treesnapshot (tar.gz zip) |
| parent | 6e9b0108c6515510580da1698af893263f8cd7de | commitdiff |
| parent | f15e7cf5cc95cbfd0d05c260f75631781e290edc | commitdiff |
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
"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 | blobhistory |