Junio C Hamano <gits...@pobox.com> writes:
> 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
Yes. Having an option can't harm anybody, and there's a clear demand for
> 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 didn't follow very closely the discussions and patch series, but that
would sound right to me. The last version of Felipes' patch series
already gives a warning only, but the wording and commit message implies
that this will become an error in the future (this is the part with
which I disagree).
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html