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

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Jul 27, 2021, 02:56 UTC
Message-ID: <60ff75c0e29b6_2d1d20889@natae.notmuch>
In-Reply-To: <CAMMLpeTL92cDmMHsE3iuhHQrVjwLFWHxE0CwD+uDBoPGAQCrkg@mail.gmail.com>

Alex Henrie wrote:

Show 13 quoted lines

> On Wed, Jul 21, 2021 at 11:11 AM Junio C Hamano <gitster@pobox.com> wrote:
> >
> > 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".
> 
> It's convenient to have the one-letter option `git pull -r` to
> override the configuration and do a rebase. I'd really like to have a
> similar one-letter option `git pull -m` to override the configuration
> and do a merge. That would also alleviate a lot of the desire for a
> separate `git update` (i.e. "fetch and rebase") command.

My proposed `git update` is not "fetch and rebase", but fetch and fast-forward.

Morevoer, `git pull -m` would still merge with the wrong order of the parents. On the other hand `git update --merge` would merge them with the correct order.

I'm not sure what -m would alleviate.

-- 
Felipe Contreras