Re: [PATCH v4] merge: new autosetupmerge option 'simple' for matching branches

From: Tao Klerks <tao@klerks.biz>
Date: Apr 22, 2022, 13:27 UTC
Message-ID: <CAPMMpojyO82ooz8hMAnd_nuGOc68Th_bRXF=2t+DuTJjR8xWgw@mail.gmail.com>
In-Reply-To: <CAPMMpoj+g-XFKXoAXzW4d6WZRSBO_uE6MRsw2jWUPAjqWFQt2A@mail.gmail.com>

On Fri, Apr 22, 2022 at 11:24 AM Tao Klerks <tao@klerks.biz> wrote:

Show 22 quoted lines

>
> On Fri, Apr 22, 2022 at 4:27 AM Junio C Hamano <gitster@pobox.com> wrote:
> >
> > Tao Klerks <tao@klerks.biz> writes:
> >
> > >
> > > Unfortunately, I'm not sure what "something better than simple" for
> > > push.default actually is, in the current system.
> >
> > "none", probably.  Much better than "current" that can create new
> > branches on the other side, which you would want to do with an
> > explicit end-user instruction (i.e. not with "git push", but with
> > "git push origin topic").
> >
>
> Hmm, I don't understand you here. You either mean "simple is the best
> option you could choose for push.default, when
> branch.autosetupmerge=simple, none of the other options are better",
> or there's a small typo and you're saying "push.default=nothing would
> be better". I'll assume the latter, but I'm not sure because I don't
> see how it can be a good-faith statement.
>

My apologies for the tone here, I clearly sent before re-reading properly. I cannot presume to state what you did mean; I meant to say something like "I assume you mean either X or Y", or "my plausible interpretations are X or Y", or something similarly reflective of my own limitations.