git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] merge: handle --ff/--no-ff/--ff-only as a tri-state option

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 1, 2013, 20:27 UTC
Message-ID
<7vppv2f2ku.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20130701195407.GK17269@suse.cz>
Miklos Vajna <vmiklos@suse.cz> writes:
Show 8 quoted lines
> 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.

Previous: Miklos VajnaNext: Michael Haggerty
Message 8 of 12 in “merge: allow using --no-ff and --ff-only at the same time”
  1. merge: allow using --no-ff and --ff-only at the same timeMiklos Vajna, Jul 1, 2013
  2. Michael HaggertyJul 1, 2013
  3. Miklos VajnaJul 1, 2013
  4. Junio C HamanoJul 1, 2013
  5. Miklos VajnaJul 1, 2013
  6. Junio C HamanoJul 1, 2013
  7. merge: handle --ff/--no-ff/--ff-only as a tri-state optionMiklos Vajna, Jul 1, 2013
  8. Junio C HamanoJul 1, 2013
  9. Michael HaggertyJul 2, 2013
  10. merge: handle --ff/--no-ff/--ff-only as a tri-state optionMiklos Vajna, Jul 2, 2013
  11. Junio C HamanoJul 2, 2013
  12. Junio C HamanoJul 2, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.