在Git中列出冲突文件的最简单方法是什么? [英] What's the simplest way to list conflicted files in Git?

问题描述

我只需要一个简单的冲突文件列表.

I just need a plain list of conflicted files.

有没有比这更简单的东西了?

Is there anything simpler than:

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

或:

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

我想我可以为此设置一个方便的alias，但是想知道专业人士是如何做到的.我会用它来编写shell循环自动解决冲突等.也许通过插入mergetool.cmd替换该循环?

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?

推荐答案

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

这篇关于在Git中列出冲突文件的最简单方法是什么?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！