diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:18:13 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:18:13 +0900 |
| commit | 35898eafab5dfd4ebc9daf2f4e422a1d4771954b (patch) | |
| tree | 78d6fc54b2b26faa195ace41e7e771a9fe445bce /builtin/diff-tree.c | |
| parent | Merge branch 'jk/drop-free-refspecs' (diff) | |
| parent | pull: ff --rebase --autostash works in dirty repo (diff) | |
| download | git-35898eafab5dfd4ebc9daf2f4e422a1d4771954b.tar.gz git-35898eafab5dfd4ebc9daf2f4e422a1d4771954b.zip | |
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
Diffstat (limited to 'builtin/diff-tree.c')
0 files changed, 0 insertions, 0 deletions