Subject: Re: [PATCH v2] pull: introduce --merge option

From: Felipe Contreras <[email-masked]>
Date: Tue, 27 Jul 2021 01:31:50 -0500

Junio C Hamano wrote:
> Linus Torvalds <[email-masked]> writes:
> 
> > On Wed, Jul 21, 2021 at 6:47 AM Felipe Contreras
> > <[email-masked]> wrote:
> >>
> >> Users need to specify if they want to either --merge or --rebase, but
> >> unfortunately the former is missing.
> >
> > Ack. I think it's just historical, because long long ago it used to be
> > that 'git pull' always merged unless told otherwise with --rebase.
> 
> The "--no-rebase" option, which is documented as a synonym for
> "--rebase=false", has been there, but the implementation is buggy in
> some corner cases, which has been worked on recently in a separate
> thread.  I do not think it is too bad to add "--merge" as yet
> another synonym for "--rebase=false".

Any particular reason why this is not a topic? [1]

[1] https://lore.kernel.org/git/[email-masked]/

-- 
Felipe Contreras