views:

72

answers:

1

I just need a plain list of conflicted files.

Is there anything simpler than:

git ls-files -u | cut -f 2 | sort -u

or

git ls-files -u | awk '{print $4}' | sort | uniq

?

I guess I could set up a handy alias for that, just was wondering how pros do it. I'd use it to write shell loops e.g. to auto-resolve conflict etc.. Maybe replace that loop by plugging into mergetool.cmd?

A: 

Trying to answer my question:

No, there doesn't seem to be any simpler way than the one in the question, out of box.

After typing that in too many times, just pasted the shorter one into an aptly named executable, made accessible to git, now I can just: git conflicts to get the list I wanted.

inger