I use Merge, but i don't use it for anything more than trivial rebasing. I'll split commits in merge then just go run `git rebase -i`.

What i want is for something to have a plan-THEN-act approach to rebasing. Like GParted, or... `git rebase -i`.

Thanks for the pointer - Retcon sounds useful but I don't have a Mac. I'll have to give Sublime Merge a try the next time I need to do some rewriting...

I use sublime-merge as a daily driver. AFAIK, it doesn't have a comparable feature for re-ordering commits.