From: Jeff King <peff@peff.net>
Date: Tue, 17 Sep 2013 22:03:45 GMT
Subject: Re: [BUG?] git checkout $commit -- somedir doesn't drop files
Message-ID: <20130917220345.GA22914@sigill.intra.peff.net>
In-Reply-To: <xmqqk3ifw1km.fsf@gitster.dls.corp.google.com>

On Tue, Sep 17, 2013 at 03:00:41PM -0700, Junio C Hamano wrote:

> > So given that, is it fair to say that a one-way "go here" merge, limited
> > by pathspec, is the closest equivalent?
> 
> Sorry, but it is unclear to me what you mean by one-way "go here"
> merge.  Do you mean oneway_merge() in unpack-trees.c?

Yes, that is what I meant.

In my mind, oneway_merge is "go here unconditionally", twoway_merge is
"go from A to B, respecting changes already made from A", and
threeway_merge is a "real" merge. But I am not sure if that is accurate
or just my confused mental model of unpack-trees. :)

-Peff