One nice little addition to git I’m using is git-extras. It’s so good to git wip and switch branches, I use it a lot!
Another useful trick: after modifying a lot files, if you don’t want to commit one of them with a git add . && git commit, you can git lock my-file which will prevent an unfortunate commit.
Don’t forget to git unlock my-file