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

Re: situation codes (e.g. #16) in unpack-trees.c

From
Jeff King <peff@peff.net>
Date
Aug 12, 2009, 21:07 UTC
Message-ID
<20090812210726.GA16640@coredump.intra.peff.net>
In-Reply-To
<bb6059c00908121405t4f34c50eo532b928fa6d6f89c@mail.gmail.com>
On Wed, Aug 12, 2009 at 02:05:06PM -0700, Jeff Enderwick wrote:
> Newbie here. I'm trying to grok git's merge algorithms. Where are
> those '#' codes written up (e.g. #16, #5ALT, etc)?
> Is there a write-up anywhere on the merge logic?
Try Documentation/technical/trivial-merge.txt.
-Peff
Previous: Jeff Enderwick
Message 2 of 2 in “situation codes (e.g. #16) in unpack-trees.c”
  1. Jeff EnderwickAug 12, 2009
  2. Jeff KingAug 12, 2009

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.