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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html