From: Jeff King <peff@peff.net>
To: Jeff Enderwick <jeff.enderwick@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: situation codes (e.g. #16) in unpack-trees.c
Date: Wed, 12 Aug 2009 17:07:27 -0400 [thread overview]
Message-ID: <20090812210726.GA16640@coredump.intra.peff.net> (raw)
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
prev parent reply other threads:[~2009-08-12 21:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-12 21:05 situation codes (e.g. #16) in unpack-trees.c Jeff Enderwick
2009-08-12 21:07 ` Jeff King [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090812210726.GA16640@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=jeff.enderwick@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox