> I usually do all the work in branches anyways, so I'll just create a quick branch and commit it there.
I never work on a checked-out version of a branch that's currently being updated. I always check out a new branch for my work and rebase or merge off the branch others are working on.
I'm fully aware of stash, and every now and then I use it, but it's pretty infrequent. Seeing as you need to learn branching anyway it's not going to be important for every workflow.
Exactly. For some busy repos I tend to remove local master (and develop) branches altogether. It's less moving parts that way.
git branch feature1 origin/master # create
...
git fetch --all
git rebase -i origin/master feature1
Also, use emacs's magit as a better ui. Even if you don't use emacs, seriously. It's fantastically easy and fast.
I usually do all the work in branches anyways, so I'll just create a quick branch and commit it there.