4 ms·git-imerge rebase is what you want, git-imerge is one of the coolest tools I've used.by lillecarl 5y agogit-imerge rebase is what you want, git-imerge is one of the coolest tools I've used.