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

Re: git-ls-files -m lists the same file multiple times

From
Junio C Hamano <junkio@cox.net>
Date
Apr 25, 2007, 18:25 UTC
Message-ID
<7v8xcgz4ye.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<200704251035.33713.andyparkins@gmail.com>
Andy Parkins <andyparkins@gmail.com> writes:
Show 6 quoted lines
> I did a merge, which had conflicts, and then fixed the conflicts.  To see what 
> files I'd changed I did git-ls-files -m.  This listed the same file multiple 
> times.  Some of them twice and some of them three times.
>
> I guess that it's showing different stages; but as the list is just filename, 
> there is no way to tell which is which and it is just confusing.

I did not imagine that anybody actually found 'ls-files -m' useful, either during a conflicted merge or under the normal situation. 'git diff --stat' is usually much more pleasant to see.

Use 'ls-files -u' during conflicted merge and be happy.
Previous: Andy ParkinsNext: Andy Parkins
Message 2 of 5 in “git-ls-files -m lists the same file multiple times”
  1. Andy ParkinsApr 25, 2007
  2. Junio C HamanoApr 25, 2007
  3. Andy ParkinsApr 25, 2007
  4. Junio C HamanoApr 25, 2007
  5. Andy ParkinsApr 25, 2007

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.