Re: [PATCH] pull: abort if --ff-only is given and fast-forwarding is impossible

Elijah Newren wrote:

I think we should concentrate on making sure that we provide
reasonable behavior when conflicting options/command-lines from the
already provided set are specified.

The only way to do that in a way that a) does not significantly alter
existing semantics, b) can be clearly documented, and c) can be
implemented without a plethora of exceptions, is to create a new
configuration orthogonal to all the existing ones:

  pull.mode=fast-forward

-- 
Felipe Contreras