One thing I've found helpful is adding git status information to my command prompt. (For this, I use oh-my-zsh.) I always know what branch I'm on, and whether it's dirty or not.

I still need to 'git status' (which I've aliased to 'gs') sometimes but more frequently I get what I need without it.