Re: [PATCH] pull: don't say that merge is "the default strategy"

From: Alex Henrie <alexhenrie24@gmail.com>
Date: Nov 18, 2021, 21:40 UTC
Message-ID: <CAMMLpeSuL2k2semwS+K1jxTNZEV79GzCymFZo+1VcsyU6bYTrg@mail.gmail.com>
In-Reply-To: <xmqqk0h5w3qy.fsf@gitster.g>

On Thu, Nov 18, 2021 at 2:30 PM Junio C Hamano <gitster@pobox.com> wrote:

Show 8 quoted lines

>
> Alex Henrie <alexhenrie24@gmail.com> writes:
>
> > Git no longer has a default strategy for reconciling divergent branches,
> > because there's no way for Git to know which strategy is appropriate in
> > any particular situation.
>
> A very good observation, and the patch makes sense.

Thanks, I'm glad you agree.

Show 11 quoted lines

> > The initially proposed version of commit
> > 031e2f7ae195069d00d21cde906fce5b0318dbdd, "pull: abort by default when
> > fast-forwarding is not possible", dropped this phrase from the message.
> > It appears that leaving it in the message in the final version of the
> > patch was accidental.
>
> Hmph, the one before later iterations v$N, i.e.
>
> https://lore.kernel.org/git/dca0455898a838b46546a29ee79f0a8b112fbff5.1626536508.git.gitgitgadget@gmail.com/
>
> seems to keep "the default" label from the beginning.

I was referring to the patch that I originally wrote, before Elijah made the changes that actually got the patch accepted: https://lore.kernel.org/git/20210627000855.530985-1-alexhenrie24@gmail.com/

> I am tempted to drop this latter last paragraph, which looks more
> like a guess than anything else, and does not add much value to
> future readers of the "git log".

That's fine by me. I almost didn't include the second paragraph in the commit message to begin with.

-Alex