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

Re: [StGit PATCH 1/2] Do simple in-index merge with diff+apply instead of read-tree

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Jul 12, 2008, 10:22 UTC
Message-ID
<b0943d9e0807120322l350784b5sfceeb967f0956cdb@mail.gmail.com>
In-Reply-To
<20080702061243.11361.75544.stgit@yoghurt>
2008/7/2 Karl Hasselström <kha@treskal.com>:
Show 5 quoted lines
> The advantage is that patch application will resolve some file content
> conflicts for us, so that we'll fall back to merge-recursive less
> often. This is a significant speedup, especially since merge-recursive
> needs to touch the worktree, which means we have to check out the
> index first.
Thanks.
-- 
Catalin
Previous: Karl HasselströmNext: Karl Hasselström
Message 3 of 9 in “push optimizations”
  1. 0/2 push optimizationsKarl Hasselström, Jul 2, 2008
  2. 1/2 Do simple in-index merge with diff+apply instead of read-treeKarl Hasselström, Jul 2, 2008
  3. Catalin MarinasJul 12, 2008
  4. 2/2 Reuse the same temp index in a transactionKarl Hasselström, Jul 2, 2008
  5. Reuse the same temp index in a transactionKarl Hasselström, Jul 3, 2008
  6. Catalin MarinasJul 12, 2008
  7. Karl HasselströmJul 14, 2008
  8. Catalin MarinasJul 7, 2008
  9. Karl HasselströmJul 8, 2008

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.