Comment by nchmy

I think you would love jj then. It is dead-simple to just move things around - branches/bookmarks, commits and even single lines of code within a diff.

jjui (https://github.com/idursun/jjui) makes it all that much easier too