And, in fact, my git setup has evolved to rely on magit (an emacs-based git GUI of sorts) for some operations, and the command line for others, and GitX for oth

And, in fact, my git setup has evolved to rely on magit (an emacs-based git GUI of sorts) for some operations, and the command line for others, and GitX for others. In this case the best tool, even for experts, is a hybrid tool.