On Tue, May 22, 2018 at 6:31 AM, Alban Gruin <alban.gruin@xxxxxxxxx> wrote: > This splits the `rebase --preserve-merges` functionnality from > git-rebase--interactive.sh. This is part of the effort to depreciate > preserve-merges. The new script, git-rebase--preserve-merges.sh, should be left > to bitrot. All the dead code left by the duplication of > git-rebase--interactive.sh is also removed. ... and I thought the original motivation was getting the rest of rebase into a shape that rewriting it is easier, the potential bit rot of --preserve-merges is rather a side effect, but not the main goal. I commented on patch 1, as I don't quite understand the changes, the other patches look good to me. Thanks, Stefan