Git tips from http://net.tutsplus.com/tutorials/tools-and-tips/git-tips-from-the-pros/