[codemonkey-zeta]

Magit with emacs solves git's UX problem IMO. Discoverability is/was git's real problem.

[disgruntledphd2]

This is true, but the trouble is that you need to know what git will do before the magit commands and options make sense.