Sounds like the same for which I started using (and then eventually abandoned) fugitive. Staging part of files is the only thing I found hard with cli but then

Sounds like the same for which I started using (and then eventually abandoned) fugitive. Staging part of files is the only thing I found hard with cli but then fugitive or simply git difftool helps with that too (using vimdiff) For everything else I defined my own git aliases (git graph, git mr, etc)