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

Re: conflict status

From
Michael Wild <themiwi@users.sourceforge.net>
Date
Aug 4, 2009, 07:31 UTC
Message-ID
<398EA050-EEC9-4C16-8225-410BBECABB13@users.sourceforge.net>
In-Reply-To
<m34osoqc5p.fsf@localhost.localdomain>
On 4. Aug, 2009, at 9:19, Jakub Narebski wrote:
Show 6 quoted lines
>
> If you don't need SHA-1s, why not use -t or -v option of git-ls-files,
> e.g.:
>
>  $ git ls-files -v -u
>

Huh? Sorry, I don't get your point. -v and -t will just prefix a "M" (or sometimes "m" in the case of-v) for unmerged files. But I already know they are unmerged, so why bother?

Previous: Jakub NarebskiNext: Junio C Hamano
Message 7 of 8 in “conflict status”
  1. Michael WildAug 3, 2009
  2. Sverre RabbelierAug 3, 2009
  3. Thomas RastAug 3, 2009
  4. Junio C HamanoAug 3, 2009
  5. Michael WildAug 4, 2009
  6. Jakub NarebskiAug 4, 2009
  7. Michael WildAug 4, 2009
  8. Junio C HamanoAug 4, 2009

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.