From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 07 Dec 2020 20:55:52 GMT
Subject: Re: [PATCH v3 00/16] pull: default warning improvements
Message-ID: <xmqqwnxt8hev.fsf@gitster.c.googlers.com>
In-Reply-To: <20201205195313.1557473-1-felipe.contreras@gmail.com>

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

> It is not a complete solution, but should improve the current situation.
>
> Since v2:
>
> 1. The warning is updated to say "a merge, a rebase, or a fast-forward"
> 2. A suggestion 'If unsure, run "git pull --merge".' is removed
> 3. A new REBASE_DEFAULT is introduced
> 4. Tests are revamped using helpers
> 5. The logic of --merge and --ff-only is updated so one can override the other
> 6. A bunch of commit messages are updated
> 7. A memory inconsistency is fixed

On what base has this series been built?  Applying to 'master' seems
to stop at the "refactor fast-forward check" step.