From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 Oct 2010 16:05:44 GMT
Subject: Re: How do I get a list of all unmerged files?
Message-ID: <7v1v7dhrc7.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20101026143245.11433.qmail@science.horizon.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"?