I love git, it's a really great tool. However no matter how used I get to my workflows I eventually end up commiting something into the wrong branch!

And although I tend to use a custom bash shell called git-sh with a full colour prompt, with all the relevant information:

!dev-home> more ...