From: Junio C Hamano <junkio@cox.net>
Date: Wed, 25 Apr 2007 18:25:45 GMT
Subject: Re: git-ls-files -m lists the same file multiple times
Message-ID: <7v8xcgz4ye.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <200704251035.33713.andyparkins@gmail.com>

Andy Parkins <andyparkins@gmail.com> writes:

> 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.