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

Re: [BUG?] git checkout $commit -- somedir doesn't drop files

From
Jeff King <peff@peff.net>
Date
Sep 17, 2013, 22:03 UTC
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:
Show 5 quoted lines
> > 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
Previous: Junio C HamanoNext: Junio C Hamano
Message 9 of 15 in “[BUG?] git checkout $commit -- somedir doesn't drop files”
  1. Uwe Kleine-KönigSep 17, 2013
  2. Junio C HamanoSep 17, 2013
  3. Jeff KingSep 17, 2013
  4. Junio C HamanoSep 17, 2013
  5. Jeff KingSep 17, 2013
  6. Junio C HamanoSep 17, 2013
  7. Jeff KingSep 17, 2013
  8. Junio C HamanoSep 17, 2013
  9. Jeff KingSep 17, 2013
  10. Junio C HamanoSep 17, 2013
  11. Jeff KingSep 19, 2013
  12. Junio C HamanoSep 19, 2013
  13. Jeff KingSep 19, 2013
  14. Junio C HamanoSep 20, 2013
  15. Jeff KingSep 17, 2013

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.