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

[PATCH] Add --ff-only flag to git-merge (take 2)

From
Yuval Kogman <nothingmuch@woobling.org>
Date
Jan 30, 2009, 04:32 UTC
Message-ID
<1233289965-19538-1-git-send-email-nothingmuch@woobling.org>
In-Reply-To
<7vbptpeoge.fsf@gitster.siamese.dyndns.org>
Hi,

This attempt fixes the various issues raised, except for the case of octopus ending in 1 or more fast forwards. I'm not sure what the best way to fix this is. I see three obvious options, none of which seem optimal:

	1. git-merge-octopus will take a --ff-only flag as well, adding a branch for that
	2. ff-only could be a merge strategy, and octopus is forbidden in
	   --ff-only, while this new strategy will behave just like octopus when
	   the merge can be fast forward only.
	3. the logic from git-merge-octopus could be duplicated into builtin-merge,
	   to handle only the fast forward case.
Please advise.

Regards, Yuval

Previous: Junio C HamanoNext: Yuval Kogman
Message 8 of 9 in “Add --ff-only flag to git-merge”
  1. Add --ff-only flag to git-mergeYuval Kogman, Jan 28, 2009
  2. Johannes SchindelinJan 28, 2009
  3. Yuval KogmanJan 28, 2009
  4. Sverre RabbelierJan 28, 2009
  5. Junio C HamanoJan 28, 2009
  6. Yuval KogmanJan 29, 2009
  7. Junio C HamanoJan 29, 2009
  8. Add --ff-only flag to git-merge (take 2)Yuval Kogman, Jan 30, 2009
  9. Add --ff-only flag to git-mergeYuval Kogman, Jan 30, 2009

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.