Re: [PATCH v7 1/1] pull: add ff-only option

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Nov 23, 2020, 23:02 UTC
Message-ID: <CAMP44s2FRZUvUy+F3banxd9MEdL=RMqEdJL3JLYEGDQkOz3vNA@mail.gmail.com>
In-Reply-To: <20201123224621.2573159-2-felipe.contreras@gmail.com>

On Mon, Nov 23, 2020 at 4:46 PM Felipe Contreras <felipe.contreras@gmail.com> wrote:

Show 21 quoted lines

>
> It is very typical for Git newcomers to inadvertently create merges and
> worse; inadvertently pushing them. This is one of the reasons many
> experienced users prefer to avoid 'git pull', and recommend newcomers to
> avoid it as well.
>
> To avoid these problems, and keep 'git pull' useful, it has been
> suggested that 'git pull' barfs by default if the merge is
> non-fast-forward, which unfortunately would break backwards
> compatibility.
>
> This patch leaves everything in place to enable this new mode, but it
> only gets enabled if the user specifically configures it;
>
>   pull.rebase = ff-only.
>
> Later on this mode can be enabled by default.
>
> For the full discussion you can read:
>
> https://lore.kernel.org/git/5363BB9F.40102@xiplink.com/

Note: Philip Oakley's address was wrong (fixed now).

-- 
Felipe Contreras