Git - What39s the simplest way to get a list of conflicted files

Questions

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, however 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?

Answers

git diff --name-only --diff-filter=U

Source

License : cc by-sa 3.0

http://stackoverflow.com/questions/3065650/whats-the-simplest-way-to-get-a-list-of-conflicted-files

Related