Re: [PATCH v6 3/3] rebase: add a config option for --rebase-merges

From

Felipe Contreras <felipe.contreras@gmail.com>

Date

Mar 16, 2023, 18:11 UTC

Message-ID

<CAMP44s3hH0Gw71UAm10Os=6YJ4RAoAJxC3exN_jekMy6-JRsVg@mail.gmail.com>

In-Reply-To

<kl6lzg8cvby2.fsf@chooglen-macbookpro.roam.corp.google.com>

On Thu, Mar 16, 2023 at 11:57 AM Glen Choo <chooglen@google.com> wrote:

> If users cleanly separate the two concepts, I think it is quite clear.
> (I'm not advocating for this approach, but) e.g. if we pretend that each
> behavior were configured separately, like:
>
> --[no-]rebase-merges [--rebase-merges-mode=(rebase-cousins|no-rebase-cousins)]
>
> I don't think there would be any confusion.

Not being conversant with these options I agree the above isn't confusing.

> (Having --rebase-merges-mode
> be a no-op without --rebase-merges is probably even more confusing to
> users, plus this would break backwards compatibility, so I don't think
> this is a good idea at all.)

-- 
Felipe Contreras