From: Gavin Guo <tuffkidtt@gmail.com>
Date: Tue, 26 Oct 2010 16:23:02 GMT
Subject: Re: How do I get a list of all unmerged files?
Message-ID: <AANLkTikthqc9xzJd0sDTXfVW6eGCNjZ0xpZuOmocFTt0@mail.gmail.com>
In-Reply-To: <7v1v7dhrc7.fsf@alter.siamese.dyndns.org>

2010/10/27 Junio C Hamano <gitster@pobox.com>:
> "George Spelvin" <linux@horizon.com> writes:
>
>> After a merge with conflicts, mostly resolved by rerere, I want to pass a list of
>> all unmerged files to the editor for manual review.
>>
>> I can see the list (wrapped in a bunch of inconvenient human-readable cruft)
>> in "git status".  I can also get a list (again with a bunch of extraneous
>> info) from "git ls-files -u".  What I can't figure out is how to get
>> "git ls-files -u" with --stage turned *off*.
>
> "rerere status"?

I think it should be reset ?? or revert ??