Miklos Vajna <vmiklos@xxxxxxx> writes: > On Mon, Jul 01, 2013 at 04:52:29PM +0200, Michael Haggerty <mhagger@xxxxxxxxxxxx> 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html