robbyrussell/oh-my-zsh — pull request #2699 by RsrchBoy (2014-04-08 03:18:42+00:00)
Title: Break out pull --rebase into fetch; rebase --autostash

...this should make auto-updating a little less of a perpetual fail for those
of us with a tendency to tinker.

Not that anyone who uses zsh and oh-my-zsh would have such a tendency :)