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

Re: [PATCH] "checkout-cache -m" writes unmerged contents for each stage.

From
Linus Torvalds <torvalds@osdl.org>
Date
Apr 18, 2005, 02:56 UTC
Message-ID
<Pine.LNX.4.58.0504171954410.7211@ppc970.osdl.org>
In-Reply-To
<7vfyxovm6j.fsf@assigned-by-dhcp.cox.net>
On Sun, 17 Apr 2005, Junio C Hamano wrote:
> 
> One small detail.  What about the "-x" bit?

You'll need to merge those kinds of changes separately for now. We'll have to resolve that too, right now I think the -x bit gets lost on a merge simply because we just write the temp-files, something merges them, and does an "update-cache" on the merged result, and we'll pick up the -x bit (or rather, lack of one) at that point.

		Linus
Previous: Junio C Hamano
Message 6 of 6 in “"checkout-cache -m" writes unmerged contents for each stage.”
  1. "checkout-cache -m" writes unmerged contents for each stage.Junio C Hamano, Apr 17, 2005
  2. Linus TorvaldsApr 18, 2005
  3. Junio C HamanoApr 18, 2005
  4. Linus TorvaldsApr 18, 2005
  5. Junio C HamanoApr 18, 2005
  6. Linus TorvaldsApr 18, 2005

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.