From: Alex Henrie <alexhenrie24@gmail.com>
Date: Sat, 04 Mar 2023 23:24:40 GMT
Subject: Re: [PATCH v5 3/3] rebase: add a config option for --rebase-merges
Message-ID: <CAMMLpeTiphSA=1aM89n4CQ5-L90qwZyXenx-JYox7=6NWj3TrA@mail.gmail.com>
In-Reply-To: <20230302180226.2699247-1-calvinwan@google.com>

On Thu, Mar 2, 2023 at 11:02 AM Calvin Wan <calvinwan@google.com> wrote:

> > +rebase.merges::
> > +     Whether and how to set the `--rebase-merges` option by default. Can
> > +     be `rebase-cousins`, `no-rebase-cousins`, or a boolean. Setting to
> > +     true is equivalent to `--rebase-merges` without an argument, setting to
> > +     `rebase-cousins` or `no-rebase-cousins` is equivalent to
> > +     `--rebase-merges` with that value as its argument, and setting to false
> > +     is equivalent to `--no-rebase-merges`. Passing `--rebase-merges` on the
> > +     command line without an argument overrides a `rebase.merges=false`
> > +     configuration but does not override other values of `rebase.merge`.
>
> I originally believed that having the boolean values as an option here
> created unnecessary complexity but I was convinced during Review Club
> that the tradeoff for a user who just wants to turn this on is fine. I'm
> just wondering whether this option will possibly have additional values
> in the future. If so, what would a user expect from setting this config
> to true?

"true" will always mean "rebase merges in the default way, I don't
care what it is". During a time period when the default is
transitioning, "true" means that the user will get a warning, but
there's nothing wrong with continuing to use "true" if they really
don't care.

-Alex