Comment by sheremetyev

You can use VisualJJ to rebase via drag & drop, split interactively etc.

https://www.visualjj.com - I'm building it and would appreciate any feedback!