On Sun, Mar 25, 2018 at 10:32 AM, Wink Saville <wink@xxxxxxxxxxx> wrote: > 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 AFAIK this breakage of preserve-merges is a design flaw which isn't really fixable, which is why --recreate-merges is being added. I believe the plan is to deprecate preserve-merges once recreate-merges has landed. Thanks, Jake