From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 02 Jul 2013 20:12:14 GMT
Subject: Re: [PATCH v2] merge: handle --ff/--no-ff/--ff-only as a tri-state option
Message-ID: <7vsizwk9gh.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20130702144757.GG5317@suse.cz>

Miklos Vajna <vmiklos@suse.cz> writes:

>>     if (fast_forward == FF_ONLY)
>>         fast_forward = FF_ALLOW;
>
> Do we really want --no-ff-only? I would rather just disable it, see the
> updated patch.

Sounds sane.

>> I'm no options guru, but I think it would be possible to implement --ff
>> and --no-ff without callbacks if you choose constants such that
>> FF_NO==0, something like:
>
> Indeed, done.

Yup, looks good.

> Actually there is also --no-squash, used by e.g. git-pull internally.
> You definitely don't want a five-state option. :-) So for now I would
> rather let --squash/--no-squash alone.

Sensible for this patch.

Will replace what was queued.  Thanks.