You wrote:
> Heya,
>
> On Mon, Aug 3, 2009 at 08:14, Michael Wild<themiwi@xxxxxxxxxxxxxxxxxxxxx> wrote:
> > Generally speaking, I would like to know for each file with a conflict what
> > it's status is, similar to what SVN does:
> > - locally modified/created/deleted/...
> > - remotely modified/created/deleted/...
>
> Try 'git status' :),
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.
The third column is the stage: 1 for base, 2 for ours, 3 for theirs.
So the above means that the file was changed between base and ours,
and removed between base and theirs (as the entry is missing).
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
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