From: Michael Wild <themiwi@users.sourceforge.net>
To: Jakub Narebski <jnareb@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Thomas Rast <trast@student.ethz.ch>,
Sverre Rabbelier <srabbelier@gmail.com>, <git@vger.kernel.org>
Subject: Re: conflict status
Date: Tue, 4 Aug 2009 09:31:13 +0200 [thread overview]
Message-ID: <398EA050-EEC9-4C16-8225-410BBECABB13@users.sourceforge.net> (raw)
In-Reply-To: <m34osoqc5p.fsf@localhost.localdomain>
On 4. Aug, 2009, at 9:19, Jakub Narebski wrote:
>
> 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?
next prev parent reply other threads:[~2009-08-04 7:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-03 15:14 conflict status Michael Wild
2009-08-03 17:37 ` Sverre Rabbelier
2009-08-03 18:17 ` Thomas Rast
2009-08-03 18:35 ` Junio C Hamano
2009-08-04 7:10 ` Michael Wild
2009-08-04 7:19 ` Jakub Narebski
2009-08-04 7:31 ` Michael Wild [this message]
2009-08-04 7:56 ` Junio C Hamano
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=398EA050-EEC9-4C16-8225-410BBECABB13@users.sourceforge.net \
--to=themiwi@users.sourceforge.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=srabbelier@gmail.com \
--cc=trast@student.ethz.ch \
/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).