From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Tue, 08 Dec 2020 00:20:17 GMT
Subject: Re: [PATCH v3 01/16] doc: pull: explain what is a fast-forward
Message-ID: <CAMP44s3jmCBaZKM1rEfTA7=HR-gr3TfHK2tH+wACsHwYYWT7iA@mail.gmail.com>
In-Reply-To: <xmqqblf58b99.fsf@gitster.c.googlers.com>

On Mon, Dec 7, 2020 at 5:08 PM Junio C Hamano <gitster@pobox.com> wrote:

> I thought that the idea that the word can be used as a verb, after
> discussing advise() messages that tells the users that they can
> "merge, rebase or fast-forward", was given and not something anybody
> needs to be explained about.

I removed that in the latest version, precisely because you can't tell
git pull to resolve a diverging branch situation by doing a
"fast-forward". It's only merge or rebase.

-- 
Felipe Contreras