From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 01 Jul 2013 20:27:29 GMT
Subject: Re: [PATCH] merge: handle --ff/--no-ff/--ff-only as a tri-state option
Message-ID: <7vppv2f2ku.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20130701195407.GK17269@suse.cz>

Miklos Vajna <vmiklos@suse.cz> writes:

> On Mon, Jul 01, 2013 at 04:52:29PM +0200, Michael Haggerty <mhagger@alum.mit.edu> wrote:
>> If I find the time (unlikely) I might submit a patch to implement these
>> expectations.
>
> Seeing that the --no-ff / --ff-only combo wasn't denied just sort of 
> accidently, I agree that it makes more sense to merge allow_fast_forward
> and fast_forward_only to a single enum, that automatically gives you 
> both benefits.

Yes, this goes in the right direction.  "Pick one out of these three
possibilities" is how the configuration is done, and the command
line option parsing should follow suit by consolidating these two
variables into one.

Thanks, will queue.

I didn't read the patch carefully, though, so review comments are
very much appreciated.