* situation codes (e.g. #16) in unpack-trees.c
@ 2009-08-12 21:05 Jeff Enderwick
2009-08-12 21:07 ` Jeff King
0 siblings, 1 reply; 2+ messages in thread
From: Jeff Enderwick @ 2009-08-12 21:05 UTC (permalink / raw)
To: git
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?
TIA,
Jeff
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: situation codes (e.g. #16) in unpack-trees.c
2009-08-12 21:05 situation codes (e.g. #16) in unpack-trees.c Jeff Enderwick
@ 2009-08-12 21:07 ` Jeff King
0 siblings, 0 replies; 2+ messages in thread
From: Jeff King @ 2009-08-12 21:07 UTC (permalink / raw)
To: Jeff Enderwick; +Cc: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-08-12 21:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-08-12 21:05 situation codes (e.g. #16) in unpack-trees.c Jeff Enderwick
2009-08-12 21:07 ` Jeff King
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.