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

Re: git pull on ia64 linux tree

From
Linus Torvalds <torvalds@osdl.org>
Date
Apr 28, 2005, 00:21 UTC
Message-ID
<Pine.LNX.4.58.0504271719380.18901@ppc970.osdl.org>
In-Reply-To
<20050428000729.GT22956@pasky.ji.cz>
On Thu, 28 Apr 2005, Petr Baudis wrote:
> 
> Hmm, doesn't the three-way read-tree -m take care of that? Then it
> should hit

Yes, you're right, I didn't think about the fact that the helper script actually does the checkout for the clashing files it merges.

(Which is not really nice, because it means that some files get updated and others don't, depending on how they were merged, but whatever..)

			Linus
Previous: Petr BaudisNext: Petr Baudis
Message 7 of 11 in “RE: git pull on ia64 linux tree”
  1. Luck, TonyApr 27, 2005
  2. Linus TorvaldsApr 27, 2005
  3. Petr BaudisApr 27, 2005
  4. Linus TorvaldsApr 27, 2005
  5. Linus TorvaldsApr 27, 2005
  6. Petr BaudisApr 28, 2005
  7. Linus TorvaldsApr 28, 2005
  8. Petr BaudisApr 28, 2005
  9. Linus TorvaldsApr 28, 2005
  10. Petr BaudisApr 28, 2005
  11. Edgar ToernigApr 28, 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.