I actually have a "ffs" alias for when I work on a project with multiple people (or from multiple computers), except it does a "git stash && git pull --rebase && git stash pop" (because "ffs" is my reaction when I try to "git push" and can't)