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

Re: Merges without bases

From
DTDarrin Thompson <darrint@progeny.com>
Date
Aug 25, 2005, 21:29 UTC
Message-ID
<1125005378.4110.25.camel@localhost.localdomain>
In-Reply-To
<1125004228.4110.20.camel@localhost.localdomain>
That didn't come out clearly. Restating:
On Thu, 2005-08-25 at 16:10 -0500, Darrin Thompson wrote:
> Could git-read-tree -m 3-args be made smart enough to treat a 0 as arg 1
> as an implicit empty tree?
> 

Could git-read-tree -m treat an argument of "0" as an implicit empty tree? It mainly seems useful as the first arg in the three arg -m form.

> Once that is done, git octopus will be able to handle the no merge base
> case.
> 

Once that is done, git octopus could _optionally_ handle the "I can't find a merge base" case by passing 0 as the merge base to git-read-tree.

-- Darrin

Previous: Darrin ThompsonNext: Junio C Hamano
Message 2 of 12 in “Merges without bases”
  1. Darrin ThompsonAug 25, 2005
  2. Darrin ThompsonAug 25, 2005
  3. Junio C HamanoAug 25, 2005
  4. Darrin ThompsonAug 25, 2005
  5. Tim OttingerSep 8, 2005
  6. Daniel BarkalowAug 26, 2005
  7. Junio C HamanoAug 26, 2005
  8. Eric W. BiedermanSep 9, 2005
  9. Martin LanghoffAug 26, 2005
  10. Daniel BarkalowAug 26, 2005
  11. Martin LanghoffAug 27, 2005
  12. Daniel BarkalowAug 27, 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.