Re: [PATCH v3 01/16] doc: pull: explain what is a fast-forward

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 7, 2020, 20:45 UTC
Message-ID: <xmqq8sa99wh3.fsf@gitster.c.googlers.com>
In-Reply-To: <20201205195313.1557473-2-felipe.contreras@gmail.com>

Felipe Contreras <felipe.contreras@gmail.com> writes:

> We want users to know what is a fast-forward in order to understand the
> default warning.

The intention is very good, but ...

Show 7 quoted lines

> +------------
> +	  A---B---C master on origin
> +	 /
> +    D---E master
> +------------
> +
> +Then `git pull` will merge in a fast-foward way up to the new master.

... I find the phrase "in a fast-forward way" a bit awkward. Perhaps use the 'fast-forward' as a verb, i.e.

	Then `git pull` notices that what is being merged is a
	descendant of our current branch, and fast-forwards our
	'master' branch to the commit.

or something like that? It should be in line with the spirit in which glossary defines fast-forward, I would think.

Show 6 quoted lines

> +
> +------------
> +    D---E---A---B---C master, origin/master
> +------------
> +
> +However, a non-fast-foward case looks very different.

s/foward/forward/ (the same typo exists above);

>  ------------
>  	  A---B---C master on origin
>  	 /