On Thu, Mar 17, 2011 at 2:38 AM, Jeff King <peff@xxxxxxxx> 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html