Re: [PATCH 3/5] pull: handle conflicting rebase/merge options via last option wins

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 15, 2021, 21:12 UTC
Message-ID: <xmqqh7gvs2mu.fsf@gitster.g>
In-Reply-To: <CABPp-BE8Qiu8Sdk8FD+UcAtZnToXFOv+Y+8Rwf3DyiZP6Te-SQ@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

Show 16 quoted lines

> On Thu, Jul 15, 2021 at 12:58 PM Junio C Hamano <gitster@pobox.com> wrote:
>>
>> Elijah Newren <newren@gmail.com> writes:
>>
>> > Let me ask two questions:
>> >
>> > 1. When is it beneficial for users to set both pull.ff and pull.rebase?
>> > 2. Is it harmful to users for us to allow both to be set when we will
>> > just ignore one?
>> >
>> > I believe the answer to (1) is "never", and the answer to (2) is "yes".
>>
>> I agree (1) never gives you anything, even though it does not hurt,
>> and (2) is "meh".
>
> Okay, let's drop this series then.

Not so fast. I did have problem with some combinations you hinted (vaguely---so it is more like "combinations I thought you hinted"), but making sure various combinations of options and configuration variables work sensibly is a worthy goal to have, I would think.