I think the conclusion from #2600 is that at least auto-rebasing should not simplify merge commits that merge a commit with its ancestor. Let's start by adding an option for that in the library.