Magit is great! Even if Emacs is not for you I'd still recommend giving only Magit a try. It transformed my workflow from staging and committing full files in o

Magit is great! Even if Emacs is not for you I'd still recommend giving only Magit a try. It transformed my workflow from staging and committing full files in one step to using the staging area with parts of files or single lines if necessary (e.g. leave out work in progress parts of a source file). Some other stuff like interactive rebase I could only grok via Magit which in turn helped my Git-CLI skills.