Re: [PATCH 0/3] Reject non-ff pulls by default

From: Jeff King <peff@peff.net>
Date: Sep 9, 2013, 19:52 UTC
Message-ID: <20130909195231.GA14021@sigill.intra.peff.net>
In-Reply-To: <xmqq1u4x4yst.fsf@gitster.dls.corp.google.com>

On Mon, Sep 09, 2013 at 11:47:45AM -0700, Junio C Hamano wrote:

Show 10 quoted lines

> You are in favor of an _option_ to allow people to forbid a pull in
> a non-ff situation, and I think other people are also in
> agreement. So perhaps:
> 
>  - drop jc/pull-training-wheel and revert its merge from 'next';
> 
>  - update Felipe's series with a bit of tweak to make it less
>    impactful by demoting error into warning and advice.
> 
> would be a good way forward?

I think that would address the concern I raised, because it does not create a roadblock to new users accomplishing their task. They can ignore the warning, or choose "merge" as the default to shut up the warning (and it is easy to choose that if you are confused, because it is what git is doing by default alongside the warning).

-Peff