From: Andy Parkins <andyparkins@gmail.com>
To: git@vger.kernel.org
Subject: git-ls-files -m lists the same file multiple times
Date: Wed, 25 Apr 2007 10:35:26 +0100 [thread overview]
Message-ID: <200704251035.33713.andyparkins@gmail.com> (raw)
Hello,
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.
Andy
--
Dr Andy Parkins, M Eng (hons), MIET
andyparkins@gmail.com
next reply other threads:[~2007-04-25 9:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-25 9:35 Andy Parkins [this message]
2007-04-25 18:25 ` git-ls-files -m lists the same file multiple times Junio C Hamano
2007-04-25 18:52 ` Andy Parkins
2007-04-25 19:20 ` Junio C Hamano
2007-04-25 20:47 ` Andy Parkins
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200704251035.33713.andyparkins@gmail.com \
--to=andyparkins@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).