I would say Emacs + Magit (https://github.com/magit/magit https://github.com/magit/magit). The legend says that some people started using Emacs for Magit only.

I would say Emacs + Magit (https://github.com/magit/magit https://github.com/magit/magit). The legend says that some people started using Emacs for Magit only. You can also try this https://hackernoon.com/be-125-more-efficient-with-git-60556a1ce971#.88gs7koqx https://hackernoon.com/be-125-more-efficient-with-git-60556a... to some point emulate what magit does with plain CLI and a fuzzy finder.