Re: Merging using only fast-forward

From: Sverre Hvammen Johansen <hvammen@gmail.com>
Date: Jan 16, 2008, 22:38 UTC
Message-ID: <402c10cd0801161438u7443ebf2xdf1d6f3040ceb1a9@mail.gmail.com>
In-Reply-To: <7vwsq9o6ls.fsf@gitster.siamese.dyndns.org>

On Jan 16, 2008 12:31 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 13 quoted lines

> A sane integration is a different story.
>
> We have --ff and --no-ff options to merge.  How should this new
> option --ff-only mesh with them?  Perhaps we would want to have
> an option --ff that takes three values?
>
>         --ff=never
>         --ff=normal
>         --ff=only
>
> and have the first one be synonym for existing --no-ff, the second
> one to be a synonym for not giving anything (or giving --ff
> explicitly), and the third one to be this new mode of operation?

Thanks for the patch. I can probably look into it tonight and do the suggested integration and test it out, I keep you posted.

-- 
Sverre Hvammen Johansen