+1 on Fork. As a person who does almost _everything_ from the command line, all of my colleagues think I’m nuts for using a GUI for git, but Fork makes basically everything I want to do with git feel effortless.