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

Re: CFT: merge-recursive in C

From
Alex Riesen <fork0@t-online.de>
Date
Jun 27, 2006, 00:24 UTC
Message-ID
<20060627002439.GD3121@steel.home>
In-Reply-To
<Pine.LNX.4.64.0606261704390.3927@g5.osdl.org>
Linus Torvalds, Tue, Jun 27, 2006 02:07:02 +0200:
Show 11 quoted lines
> > 
> > git-diff-tree is one of the simplest git operations. We've got absolutely 
> > _tons_ of infrastructure in place to do it efficiently, since it's done 
> > all over the map (a "git-rev-list" with path limiting will do a diff-tree 
> > against all the commits).
> 
> Side note - I think merge-recursive could/should be rewritten to use 
> "git-merge-tree" instead of "git-read-tree -u -m". I suspect that the 
> git-merge-tree output is in fact a lot closer to what git-merge-recursive 
> actually wants to have.
> 
Yep. And does not touch the index, too. Cool...
Previous: Linus TorvaldsNext: Junio C Hamano
Message 5 of 27 in “CFT: merge-recursive in C”
  1. Alex RiesenJun 26, 2006
  2. CFT: merge-recursive in C (test updates)Alex Riesen, Jun 26, 2006
  3. Linus TorvaldsJun 26, 2006
  4. Linus TorvaldsJun 27, 2006
  5. Alex RiesenJun 27, 2006
  6. Junio C HamanoJun 27, 2006
  7. Alex RiesenJun 27, 2006
  8. Junio C HamanoJun 27, 2006
  9. Alex RiesenJun 27, 2006
  10. Notes on diffcore APIJunio C Hamano, Jun 27, 2006
  11. Alex RiesenJun 27, 2006
  12. Junio C HamanoJun 27, 2006
  13. Johannes SchindelinJun 28, 2006
  14. Johannes SchindelinJun 27, 2006
  15. Alex RiesenJun 27, 2006
  16. Johannes SchindelinJun 27, 2006
  17. Alex RiesenJun 27, 2006
  18. Junio C HamanoJun 27, 2006
  19. Alex RiesenJun 27, 2006
  20. Johannes SchindelinJun 27, 2006
  21. Alex RiesenJun 27, 2006
  22. Uwe ZeisbergerJun 28, 2006
  23. Alex RiesenJun 28, 2006
  24. Junio C HamanoJun 28, 2006
  25. Christopher FaylorJun 28, 2006
  26. Alex RiesenJun 29, 2006
  27. Christopher FaylorJun 29, 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.