Re: How do I get a list of all unmerged files?

From: Jay Soffian <jaysoffian@gmail.com>
Date: Oct 26, 2010, 15:31 UTC
Message-ID: <AANLkTi=JipA6P72hY5_FSvohCruf8hqsJc8Rh53FzAzT@mail.gmail.com>
In-Reply-To: <20101026143245.11433.qmail@science.horizon.com>

On Tue, Oct 26, 2010 at 10:32 AM, George Spelvin <linux@horizon.com> wrote:

Show 12 quoted lines

> 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*.
>
> I'm sure this exists somewhere, but I can't find it.  Can someone enlighten
> me?
>
> vim `git command here`

$ git help unmerged `git unmerged' is aliased to `!git ls-files --unmerged | cut -f2 | uniq'

If there's a better way to do it, I don't know what it is.

j.