From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 05 Dec 2020 20:15:35 GMT
Subject: Re: [PATCH v3 13/16] pull: add proper error with --ff-only
Message-ID: <CAMP44s3xqjoJm5AL6dLcS6R-RFGGOdQ39W+ZY3_PWL+WMeCxjw@mail.gmail.com>
In-Reply-To: <20201205195313.1557473-14-felipe.contreras@gmail.com>

On Sat, Dec 5, 2020 at 1:53 PM Felipe Contreras
<felipe.contreras@gmail.com> wrote:
>
> The current error is not user-friendly:
>
>   fatal: not possible to fast-forward, aborting.
>
> We want something that actually explains what is going on:
>
>   The pull was not fast-forward, please either merge or rebase.
>
> The user can get rid of the warning by doing either --merge or
> --rebase.
>
> Except: doing "git pull --merge" is not actually enough; we would return
> to the previous behavior: "fatal: not possible to fast-forward,
> aborting". In order to do the right thing we will have to change the
> semantics of --ff-only.

This commit is wrong, the next one somehow got squashed into it.

I'm sending the two patches separately.

-- 
Felipe Contreras