'git difftool'仅修改文件

Question

I have many new files as well as some modified files that I added to my branch, and when I do git difftool master it diffs all modified files as well as opening up for all new files. I see things like

Launching WinMergeU.exe: /dev/null src/example1.cpp

It is rather annoying since it is somewhat pointless to looking at a diff of new files.

Is there a way to only have Git diff the modified files and ignore new files?

Answer 1

我刚刚测试了这个答案 ，它与difftool似乎同样有效。

git difftool --diff-filter=M

Answer 2

_{Just adding to the answer of Merlin2011 :)}

You are looking for --diff-filter=M to show only files M odified between the two branches.

From man git-diff

--diff-filter=[ACDMRTUXB*]

Select only files that are

A Added

C Copied

D Deleted

M Modified

R Renamed

T have their type (mode) changed

U Unmerged

X Unknown

B have had their pairing Broken

* All-or-none

Any combination of the filter characters may be used.

When * (all-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected.