There is a "TODO known breakage" in t3404-rebase-interactve.sh: not ok 24 - exchange two commits with -p # TODO known breakage I'm contemplating trying to fix it. But with --recreate-merges coming maybe it's not worth the effort. Should I proceed with attempting a fix or is --preserve-merges going to be a synonym for --recreate-merges? -- Wink