在Git中列出冲突文件的最简单方法是什么?

我只需要一份冲突文件列表。

还有什么比:

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

or:

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

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

当前回答

只需阅读手册页的git状态，并过滤什么是需要的。

 git status --help

代码片段:

       For paths with merge conflicts, X and Y show the modification states of each side of the merge. For paths that do not have merge conflicts, X shows the status of the index, and Y shows the status of the work tree. For untracked
   paths, XY are ??. Other status codes can be interpreted as follows:

   •   ' ' = unmodified

   •   M = modified

   •   A = added

   •   D = deleted

   •   R = renamed

   •   C = copied

   •   U = updated but unmerged

   Ignored files are not listed, unless --ignored option is in effect, in which case XY are !!.

       X          Y     Meaning
       -------------------------------------------------
                [AMD]   not updated
       M        [ MD]   updated in index
       A        [ MD]   added to index
       D                deleted from index
       R        [ MD]   renamed in index
       C        [ MD]   copied in index
       [MARC]           index and work tree matches
       [ MARC]     M    work tree changed since index
       [ MARC]     D    deleted in work tree
       [ D]        R    renamed in work tree
       [ D]        C    copied in work tree
       -------------------------------------------------
       D           D    unmerged, both deleted
       A           U    unmerged, added by us
       U           D    unmerged, deleted by them
       U           A    unmerged, added by them
       D           U    unmerged, deleted by us
       A           A    unmerged, both added
       U           U    unmerged, both modified
       -------------------------------------------------
       ?           ?    untracked
       !           !    ignored
       -------------------------------------------------

2022-12-19 17:02:44

其他回答

你可以在命令行上点击git ls-files -u，它会列出有冲突的文件

2015-08-11 07:34:55

这对我来说很管用:

<<<<<< HEAD'

git grep '<<<<<<< HEAD' | less -N

2016-10-27 15:57:39

我一直只使用git状态。

可以在最后添加awk来获得文件名吗

git status -s | grep ^U | awk '{print $2}'

2014-01-24 18:06:36

使用git diff，带name-only只显示名称，diff-filter=U只包括'Unmerged'文件(可选地，相对于当前工作目录显示路径)。

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

2012-06-03 23:43:59

Git的状态会在有冲突的文件旁边显示“已修改”，而不是“已修改”或“新文件”等

2011-10-19 09:53:42

在Git中列出冲突文件的最简单方法是什么?

推荐文章

最新文章

标签