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

Re: [PATCH] submodule merge support

From
Martin Waitz <tali@admingilde.org>
Date
May 7, 2007, 19:33 UTC
Message-ID
<20070507193314.GL30511@admingilde.org>
In-Reply-To
<alpine.LFD.0.98.0705071015230.3802@woody.linux-foundation.org>
hoi :)
On Mon, May 07, 2007 at 10:17:11AM -0700, Linus Torvalds wrote:
> Oh, btw, you should also look out for the case where the superproject 
> doesn't actually have the subprojects in question checked out. What 
> happens then? Just leave them conflicted?
yes, I think that's the only sane thing one can do.
-- 
Martin Waitz
Previous: Martin Waitz
Message 10 of 10 in “submodule merge support”
  1. submodule merge supportMartin Waitz, May 6, 2007
  2. Alex RiesenMay 6, 2007
  3. Martin WaitzMay 6, 2007
  4. Linus TorvaldsMay 6, 2007
  5. Martin WaitzMay 7, 2007
  6. Johannes SixtMay 7, 2007
  7. Linus TorvaldsMay 7, 2007
  8. Martin WaitzMay 7, 2007
  9. Martin WaitzMay 7, 2007
  10. Martin WaitzMay 7, 2007

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.