From: Michael Wild Date: Tue, 04 Aug 2009 07:31:13 GMT Subject: Re: conflict status Message-ID: <398EA050-EEC9-4C16-8225-410BBECABB13@users.sourceforge.net> In-Reply-To: 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?