Re: [RFC/PATCH] Fast forward strategies only, common, fork and path

[Junio C Hamano <gitster@pobox.com>]

"Sverre Hvammen Johansen" <hvammen@gmail.com> writes:

> ...  However, it might take some time.  What is the
> time-frame for inclusion in 1.5.5?

The 1.5.4 cycle was too long (5 months).  A regular interval
ought to be about 3 months but I'd really like to keep 1.5.5
focused on obvious and unanimously supported changes that do not
impact the existing semantics deeply, and keep it shorter than
that.

I think it is too early to tell if this topic falls into that
category.  The patch is only a few day old, and there has been
no real discussion nor comments on it yet.  I also felt that the
backstory was lacking and it would be hard to judge for people
other than yourself how useful the new ff substrategies are in
what context.

The documentation updates talked about what the options do, but
it was unclear why they could be useful in what situations and
workflows.  At least it was not apparent to me on my cursory
read.

> --ff=never will turn this off together with fast forward.  Maybe we
> should have --ff=traditional that is the old behavior.

Sure, and I mildly suspect that it should be the default.