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

From: Alex Henrie <alexhenrie24@gmail.com>
Date: Jul 26, 2021, 04:06 UTC
Message-ID: <CAMMLpeTL92cDmMHsE3iuhHQrVjwLFWHxE0CwD+uDBoPGAQCrkg@mail.gmail.com>
In-Reply-To: <xmqqeebregns.fsf@gitster.g>

On Wed, Jul 21, 2021 at 11:11 AM Junio C Hamano <gitster@pobox.com> wrote:

Show 6 quoted lines

>
> 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.

Junio, would you be willing to accept adding -m without adding --merge also?

-Alex