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

Re: Merging using only fast-forward

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 19, 2008, 10:43 UTC
Message-ID
<7vzlv2858y.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<402c10cd0801190228o68995493u9b8b40e1557092dd@mail.gmail.com>
"Sverre Hvammen Johansen" <hvammen@gmail.com> writes:
Show 5 quoted lines
> The more I think about this is that --ff-only should really be
> specified as a merge strategy (single) and not as an special case of
> --ff.  All merge strategies can then take any number of commits, but
> will only succeed if the commits can be reduced down to two or fewer
> for resolve/recursive and one for single.
Interesting.

At one end of the spectrum, we have these crazy people who want git to record something that is not a merge at all as a merge with --no-ff. At the other end of the spectrum, we have these other crazy people who want git to outsmart them by allowing them to throw random set of commits as potential parents, remove duplicates and figure out how many real parents the resulting merge should have (including the case that it may not even have any).

I'll have to think about it, but it sounds like a promising idea.

Previous: Sverre Hvammen JohansenNext: Sverre Hvammen Johansen
Message 11 of 15 in “Merging using only fast-forward”
  1. Sverre Hvammen JohansenJan 16, 2008
  2. Randal L. SchwartzJan 16, 2008
  3. Junio C HamanoJan 16, 2008
  4. Sverre Hvammen JohansenJan 16, 2008
  5. Junio C HamanoJan 16, 2008
  6. Sverre Hvammen JohansenJan 17, 2008
  7. Sverre Hvammen JohansenJan 18, 2008
  8. Junio C HamanoJan 18, 2008
  9. Sverre Hvammen JohansenJan 19, 2008
  10. Sverre Hvammen JohansenJan 19, 2008
  11. Junio C HamanoJan 19, 2008
  12. Sverre Hvammen JohansenJan 19, 2008
  13. Sverre Hvammen JohansenJan 21, 2008
  14. Sverre Hvammen JohansenJan 19, 2008
  15. Please don't reply to this threadSverre Hvammen Johansen, Jan 19, 2008

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.