when edamagit fails me I rely on smagit
I've never been proficient enough with Emacs, no matter how much I tried,but Magit is its killer app
https://github.com/maio/smagit