I’m a big fan of SourceTree by Atlassian. While purists might scoff at a GUI for Git, I find my normal workflow much improved by a few pretty pictures. And for the tough stuff, the Terminal is dedicated button on the main repo view. What stinks about SourceTree, at least on Windows, is that the Putty/Embedded …