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

Re: [PATCH] A new merge algorithm, take 2

From
Junio C Hamano <junkio@cox.net>
Date
Aug 28, 2005, 09:42 UTC
Message-ID
<7vslwuo0si.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20050828080341.GA1928@c165.ib.student.liu.se>
Fredrik Kuivinen <freku045@student.liu.se> writes:
> I didn't know you could do things like that with git-ls-files :) But
> yeah, it's certainly less intrusive to do it that way. It will
> probably simplify things a great deal too. Wouldn't '--unmerged' be
> the appropriate flag to use for git-ls-files in this case?
Certainly.  I was trying to see if you are paying attention ;-).
Previous: Fredrik Kuivinen
Message 4 of 4 in “A new merge algorithm, take 2”
  1. A new merge algorithm, take 2Fredrik Kuivinen, Aug 27, 2005
  2. Junio C HamanoAug 28, 2005
  3. Fredrik KuivinenAug 28, 2005
  4. Junio C HamanoAug 28, 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.