git-imerge incremental merge and rebase with superpowersgithub.com/mhagger5 pointslillecarl7 years ago