I think that at the point in the workflow where you are ready to get some new changes from upstream and integrate with your local ones, you're probably going to have all your outstanding work in a commit.

A rebase that is part of a pull, together with auto-stash, doesn't make a whole lot of sense.

I've never run into the problem of not being able to rebase due to uncommitted changes, except in two situations:

- suddenly wanting to rewrite something in the branch, unrelated to the in-progress work.

- working in a badly structured project whose builds alter tracked files

whoa, autostash is brilliant