Thomas Rast <trast@xxxxxxxxxxxxxxx> writes: > That only shows 'unmerged: foo' for me... > > The closest to porcelain I can get while still having all the > information is > > $ git ls-files -s foo > 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 1 foo > 100644 d00491fd7e5bb6fa28c517a0bb32b8b506539d4d 2 foo > > In other words, not porcelain at all. "git ls-files -u" would be what you want. It shows all the paths with conflicts in the index, and omits paths without conflicts in the index. And the object names allow you to inspect the individual stages. -- 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