Frank Li <lznuaa@xxxxxxxxx> writes: > There are conflict when I call git merge > git ls-files -u > 100644 54d05e1c40c686027b611b702e014284e9ab9a31 1 a.c > 100644 a8a1b77c0d92f33491a0a69a8645f02ececb1eb6 2 a.c > 100644 642ba972b2234f63048abcca544b3926f94e04ee 3 a.c > > but when use git diff-index HEAD > :100644 100644 a8a1b77c0d92f33491a0a69a8645f02ececb1eb6 0000000000000000000000 > 0000000000000000 M a.c > > a.c flag is M: Modification of the contents or mode of a file. That is correct. By asking "git diff-index HEAD", you are asking to compare the work tree contents through the index against HEAD commit. The work tree path by definition cannot be "unmerged" as there is no stages in the work tree. "git diff-index --cached HEAD" would compare the index against the HEAD commit, and would say it is unmerged. -- 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
