Hi Alex,

On Thu, 16 Mar 2023, Alex Henrie wrote:

If we add a rebase-evil-merges mode, do you think that would be
orthogonal to the rebase-cousins mode?

Those two concepts are very much orthogonal.

The rebase-evil-merges mode needs to change the way the `merge` command
operates, from "forget everything but the commit message of the original
merge commit" to "do try to figure out what amendments were made to the
original merge and replay them".

Whether cousins are rebased or not has everything to do with the `reset`
command, though.

Elsewhere in the thread, you mentioned a suspicion that `rebase-cousins`
should become the default. However, that would be a radical shift from the
spirit of the `git rebase [-r] <onto>` command: If `<onto>` is reachable
from `HEAD`, the idea is that an unchanged rebase script will produce the
identical commit topology. This is in line with a regular (non-`-r`)
rebase as long as there are no merge commits between `<onto>` and `HEAD`.
I am not sure that such a radical shift could ever be an easy sell.

Ciao,
Johannes