[pflock]

Haven't used Magit w/ emacs but have been using a library inspired by in for the last year or so: https://github.com/jreybert/vimagit

not sure how it compares feature wise but I've found it extremely helpful.