On Mon, Feb 20, 2023 at 2:31 AM Phillip Wood [off-list ref] wrote:

On 20/02/2023 03:32, Alex Henrie wrote:

quoted

Name the new option "drop" intead of "no" or "false" to avoid confusion > in the future if --rebase-merges grows the ability to truly "rebase"
merge commits by reusing the conflict resolution information from the
original merge commit, and we want to add an option to ignore the
conflict resolution information.

This option can be used to countermand a previous --rebase-merges
option.

I'm a bit confused as to the reason for this change - what's the
advantage over just saying --no-rebase-merges which already exists?

I didn't know that there was a --no-rebase-merges option because there
is no documentation about it and no tests for it. I will replace this
patch with patches that add the missing documentation and tests.

-Alex