Here's the tool I was referencing: http://git-scm.com/docs/git-gui

It just seemed so confusing compared to the other tools I mentioned, and it would try to do all this extra stuff for you automatically (i.e. adding weird extra arguments to the git commands and I had no idea what they did)