From: Jakub Narebski <jnareb@gmail.com>
Date: Tue, 11 Mar 2008 09:15:34 GMT
Subject: Re: [RFC/PATCH] Fast forward strategies allow, never, and only
Message-ID: <m33aqxzknl.fsf@localhost.localdomain>
In-Reply-To: <402c10cd0803101959q619efa86pbd501e5e2cc018c2@mail.gmail.com>

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

> +FAST FORWARD STRATEGIES
> +-----------------------

I think this should be named FAST FORWARD OPTIONS or something like
that.

> +
> +allow::
> +	Do not generate a merge commit if the merge resolved
> +	as a fast-forward, only update the branch pointer.
> +	This is the default behavior of git-merge.

This is equivalent of current '--ff'; perhaps this should be mentioned
as well in this option description.

> +never::
> +	Generate a merge commit even if the merge resolved
> +	as a fast-forward.

This is equivalent of current '--no-ff'; nevertheless I think that it
would be better to name this strategy 'commit' or 'merge', as in
--ff=merge, or --ff=commit.

> +only::
> +	Only allow a fast-forward.  The merge will fail
> +	unless HEAD is up to date or the merge resolved as
> +     a fast-forward.

This is equivalent of '--ff-only' or '--strategy=ff'... Errr...
I'm sorry, such option does not exist, and it would be I guess
useful addition to default non '+' fetch refspec allowing fast-forward
only, and to receive.denyNonFastForwards to control push behavior.


>  --no-ff::
>  	Generate a merge commit even if the merge resolved as a
> -	fast-forward.
> +	fast-forward.  --on-ff is an alias for --ff=never.

Typo: '--on-ff' instead of '--no-ff'.

-- 
Jakub Narebski
Poland
ShadeHawk on #git