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

Re: "tla missing -s" equivalent with git/cogito

From
Junio C Hamano <junkio@cox.net>
Date
Jan 18, 2006, 17:46 UTC
Message-ID
<7vlkxdwhs6.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<43CE75F0.4060009@op5.se>
Andreas Ericsson <ae@op5.se> writes:
> The "pull" above will do the merging nessecary. You can merge several
> branches at once if you like (known as "doing an octopus" in
> gittish. I imagine that's a star-merge in arch).

Arch star-merge is not an octopus. They have different "merge strategy" just like we have more than one. No, I do not remember the details of how they do it.

Previous: Andreas EricssonNext: Martin Langhoff
Message 3 of 10 in “"tla missing -s" equivalent with git/cogito”
  1. Belmar-LetelierJan 18, 2006
  2. Andreas EricssonJan 18, 2006
  3. Junio C HamanoJan 18, 2006
  4. Martin LanghoffJan 18, 2006
  5. Petr BaudisJan 18, 2006
  6. Martin LanghoffJan 18, 2006
  7. Martin LanghoffJan 18, 2006
  8. Petr BaudisJan 18, 2006
  9. Martin LanghoffJan 18, 2006
  10. Petr BaudisJan 18, 2006

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.