If you can hang with it being in emacs, magit is phenomenal and makes a lot of the harder things (rebase, conflict resolution, etc.) in git easier. Lightning t

If you can hang with it being in emacs, magit is phenomenal and makes a lot of the harder things (rebase, conflict resolution, etc.) in git easier. Lightning talk: https://www.youtube.com/watch?v=4ccCNQaTJ10 https://www.youtube.com/watch?v=4ccCNQaTJ10 also, if you are a vimmer use spacemacs to get out of the box, nicely configured vim.