From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 Jul 2021 17:06:11 GMT
Subject: Re: [PATCH v2] pull: introduce --merge option
Message-ID: <CAHk-=whf-9kNV3y5G-VVA2K5EZCnvv94paAEj6p=i2R4RM2emQ@mail.gmail.com>
In-Reply-To: <20210721134650.1866387-1-felipe.contreras@gmail.com>

On Wed, Jul 21, 2021 at 6:47 AM Felipe Contreras
<felipe.contreras@gmail.com> 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.

               Linus