From: Jay Soffian <jaysoffian@gmail.com>
Date: Thu, 17 Mar 2011 07:04:14 GMT
Subject: Re: Sharing a massive distributed merge
Message-ID: <AANLkTikdXCo_3hGZSaW3+9x6gQ2_B3A=scWN-f3gMSY4@mail.gmail.com>
In-Reply-To: <20110317063816.GD11931@sigill.intra.peff.net>

On Thu, Mar 17, 2011 at 2:38 AM, Jeff King <peff@peff.net> wrote:
> [2] It really seems like the right command to get the list of resolved
> files would be "git diff-index" with either a diff-filter, or grepping
> the output of --name-status. But I couldn't convince it to show me
> unmerged files; the unmerged entries always just appeared as
> modifications (actually, deletions in --raw), which made them
> indistinguishable from modified resolutions.

I use this alias for getting unmerged files:

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

j.