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

Re: [PATCH 0/5] git-merge-fredrik updates

From
Junio C Hamano <junkio@cox.net>
Date
Sep 12, 2005, 21:58 UTC
Message-ID
<7v1x3u7xtk.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20050912212601.GB6644@c165.ib.student.liu.se>
Thanks.  Will apply.

One request before we hit 0.99.7 (this Saturday) when the name will be cast in stone is to christen it better than 'fredrik' which was what I did as a tentative measure. Otherwise we would regret when you come up with another merge algorithm with different pros-and-cons with the current one.

Previous: Fredrik KuivinenNext: Fredrik Kuivinen
Message 7 of 8 in “git-merge-fredrik updates”
  1. 0/5 git-merge-fredrik updatesFredrik Kuivinen, Sep 12, 2005
  2. 1/5 Fix assertion failure when merging common ancestors.Fredrik Kuivinen, Sep 12, 2005
  3. 2/5 Exit with status code 2 if we get an exception.Fredrik Kuivinen, Sep 12, 2005
  4. 3/5 Introduce a 'die' function.Fredrik Kuivinen, Sep 12, 2005
  5. 4/5 Make sure we die if we don't get enough arguments.Fredrik Kuivinen, Sep 12, 2005
  6. 5/5 Make the ProgramError class printable.Fredrik Kuivinen, Sep 12, 2005
  7. Junio C HamanoSep 12, 2005
  8. Rename the 'fredrik' merge strategy to 'recursive'.Fredrik Kuivinen, Sep 13, 2005

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.