What we need is a GUI app for controlling git. Something that lets users drag and drop branches, and click undo, fix merge conflicts, etc, without having to use the command line. It would draw two commit trees, one local, one remote, and the common parts would be in one colour and the differences in another, etc. Basically make it /extremely/ intuitive and remove the need to know the command line.

(Also it can say what it's doing in command-line form, for those who want to learn it and move on from the GUI).

I didn't do an exhaustive search, if such a project exists please point me to it. GitHub's desktop app is a start but it does not fit the bill, same for git gui and gitk.