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

Re: conflict status

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 3, 2009, 18:35 UTC
Message-ID
<7vvdl4925k.fsf@alter.siamese.dyndns.org>
In-Reply-To
<200908032017.35101.trast@student.ethz.ch>
Thomas Rast <trast@student.ethz.ch> writes:
Show 10 quoted lines
> That only shows 'unmerged: foo' for me...
>
> The closest to porcelain I can get while still having all the
> information is
>
>   $ git ls-files -s foo
>   100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 1       foo
>   100644 d00491fd7e5bb6fa28c517a0bb32b8b506539d4d 2       foo
>
> In other words, not porcelain at all.

"git ls-files -u" would be what you want. It shows all the paths with conflicts in the index, and omits paths without conflicts in the index. And the object names allow you to inspect the individual stages.

Previous: Thomas RastNext: Michael Wild
Message 4 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.