blocks|key|581884|text|Omg，驱动程序和awk来排除一个糟糕的文件？使用git+1.9+something后，您可以：|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|581885|git+diff+--+.+':(exclude)db/irrelevant.php'+':(exclude)db/irrelevant2.php'|code-block|syntax|javascript|581886|(在Winodws上，将单引号'替换为双引号"。)|style|CODE|581887|啊，优雅！请参阅引用的答案并通过@torek+this+answer获取详细信息|581888|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/a/21079437/281545|1|https://stackoverflow.com/a/39937070/281545^0|P|H|0|0|0|F|1|M|1|0|N|B|1|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@$A|Z|B|10|1|11]]|C|$]]|$1|D|3|E|5|F|7|12|8|@]|9|@]|C|$G|H]]|$1|I|3|J|5|6|7|13|8|@$A|14|B|15|K|L]|$A|16|B|17|K|L]]|9|@]|C|$]]|$1|M|3|N|5|6|7|18|8|@]|9|@$A|19|B|1A|1|1B]]|C|$]]|$1|O|3|-4|5|6|7|1C|8|@]|9|@]|C|$]]]|P|$Q|$5|R|S|T|C|$U|V]]|W|$5|R|S|T|C|$U|X]]]]

Omg, drivers and awk to exclude a lousy file ? Since <a href="https://stackoverflow.com/a/21079437/281545">git 1.9 something</a> you can:
<pre><code>git diff -- . ':(exclude)db/irrelevant.php' ':(exclude)db/irrelevant2.php'
</code></pre>
(On Winodws, replace the single quotes <code>'</code> by double quotes <code>&quot;</code>.)
Ah, elegance! See the quoted answer and for details <a href="https://stackoverflow.com/a/39937070/281545">this answer</a> by @torek

blocks|key|581966|text|此方法比公认的答案更短。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|581967|git+diff+987200fbfb+878cee40ba+--+':!*.cs'|code-block|syntax|javascript|581968|有关不同的包含/排除可能性的更多信息，请阅读this+other+post|offset|length|581969|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/questions/5685007/making-git-log-ignore-changes-for-certain-paths/21079437#21079437^0|0|0|M|F|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|T|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|U|8|@]|9|@$I|V|J|W|1|X]]|A|$]]|$1|K|3|-4|5|6|7|Y|8|@]|9|@]|A|$]]]|L|$M|$5|N|O|P|A|$Q|R]]]]

This method is shorter than the accepted answers.
<pre><code>git diff 987200fbfb 878cee40ba -- ':!*.cs'
</code></pre>
For more information about the different inclusion/exclusion possibilities read <a href="https://stackoverflow.com/questions/5685007/making-git-log-ignore-changes-for-certain-paths/21079437#21079437">this other post</a>

blocks|key|582319|text|最简单的答案|type|unstyled|depth|inlineStyleRanges|entityRanges|data|582320|git+diff+':!db/irrelevant.php'|code-block|syntax|javascript|582321|它只是在你的diff命令之后的':!<path+to+file>'。diff命令可以像您喜欢的那样复杂，您可以使用*.min.js之类的通配符，也可以根据需要添加多个排除(用空格分隔引用的块)。|offset|length|style|CODE|582322|entityMap^0|0|0|F|I|1L|8|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Q|8|@$I|R|J|S|K|L]|$I|T|J|U|K|L]]|9|@]|A|$]]|$1|M|3|-4|5|6|7|V|8|@]|9|@]|A|$]]]|N|$]]

<h2>Simplest answer</h2>
<pre><code>git diff ':!db/irrelevant.php'
</code></pre>
It's just <code>':!&lt;path to file&gt;'</code> after your diff command. The diff command can be as complicated as you like, and you can use wildcards like <code>*.min.js</code> or add multiple excludes (space separate the quoted blocks) if you want.

blocks|key|365757|text|您还可以使用patchutils程序集合的filterdiff程序来排除diff的某些部分。例如：|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|365758|git+diff+%7C+filterdiff+-p+1+-x+db/irrelevant.php|code-block|syntax|javascript|365759|entityMap|0|LINK|mutability|MUTABLE|url|http://cyberelk.net/tim/software/patchutils/|1|http://www.linuxmanpages.com/man1/filterdiff.1.php^0|6|A|0|L|A|1|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@$A|T|B|U|1|V]|$A|W|B|X|1|Y]]|C|$]]|$1|D|3|E|5|F|7|Z|8|@]|9|@]|C|$G|H]]|$1|I|3|-4|5|6|7|10|8|@]|9|@]|C|$]]]|J|$K|$5|L|M|N|C|$O|P]]|Q|$5|L|M|N|C|$O|R]]]]

You can also use <a href="http://www.linuxmanpages.com/man1/filterdiff.1.php" rel="noreferrer">filterdiff</a> program of the <a href="http://cyberelk.net/tim/software/patchutils/" rel="noreferrer">patchutils</a> program collection to exclude some parts of a diff. For example:

<pre><code>git diff | filterdiff -p 1 -x db/irrelevant.php
</code></pre>

blocks|key|366244|text|对于我需要做的事情，KurzedMetal的回答真的很好，那就是能够看到文件已经更改，但不能生成差异，在我的情况下，差异可能会很大。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|366245|但我的一位同事提出了一种更简单的方法，对我来说很有效：|366246|在git+diff要忽略的文件所在目录添加.gitattributes文件，内容如下：|style|CODE|366247|file-not-to-diff.bin+-diff|366248|这仍然会让git+status在文件发生更改时“看到”。git+diff还将“看到”文件已更改，但不会生成diff。|366249|示例中文件的.bin扩展名是有意为之的。我确实意识到这是git对二进制文件的默认行为，它不需要对.gitattributes进行特殊处理。但在我的例子中，git和"file“实用程序将这些文件识别为文本文件，这就解决了问题。|366250|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/users/236871/kurzedmetal^0|A|B|0|0|0|1|8|L|E|0|0|Q|0|5|A|S|8|1H|4|0|6|4|1C|E|0^^$0|@$1|2|3|4|5|6|7|X|8|@]|9|@$A|Y|B|Z|1|10]]|C|$]]|$1|D|3|E|5|6|7|11|8|@]|9|@]|C|$]]|$1|F|3|G|5|6|7|12|8|@$A|13|B|14|H|I]|$A|15|B|16|H|I]]|9|@]|C|$]]|$1|J|3|K|5|6|7|17|8|@$A|18|B|19|H|I]]|9|@]|C|$]]|$1|L|3|M|5|6|7|1A|8|@$A|1B|B|1C|H|I]|$A|1D|B|1E|H|I]|$A|1F|B|1G|H|I]]|9|@]|C|$]]|$1|N|3|O|5|6|7|1H|8|@$A|1I|B|1J|H|I]|$A|1K|B|1L|H|I]]|9|@]|C|$]]|$1|P|3|-4|5|6|7|1M|8|@]|9|@]|C|$]]]|Q|$R|$5|S|T|U|C|$V|W]]]]

Really good answer from <a href="https://stackoverflow.com/users/236871/kurzedmetal">KurzedMetal</a> for what I needed to do, which was ability to see that the file has changed, but not to generate the diff, which could have been huge, in my case.
But a colleague of mine suggested approach that was even simpler and worked for me:
adding <code>.gitattributes</code> file in the directory where the file to be ignored by <code>git diff</code> resides with the following content:
<code>file-not-to-diff.bin -diff</code>
That still lets <code>git status</code> &quot;see&quot; if the file changed. <code>git diff</code> will also &quot;see&quot; that the file changed, but it will not generate the <code>diff</code>.
That <code>.bin</code> extension for the file in the example was deliberate. I do realize that this is the default behavior of git for binary files, and it does not require special handling with <code>.gitattributes</code>. But in my case, these files were recognized as text files by git and &quot;file&quot; utility, and this did the trick.

blocks|key|365838|text|此单行解决方案不需要其他实用程序/下载：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|365839|git+diff+`git+status+-s+%7Cgrep+-v+%5E\+D+%7Cgrep+-v+file/to/exclude.txt+%7Ccut+-b4-`|code-block|syntax|javascript|365840|其中，file/to/exclude.txt是您想要排除的文件的名称。|offset|length|style|CODE|365841|编辑:+credit+ksenzee用于修复已删除的文件，打破差异。|365842|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/users/281622/ksenzee^0|0|0|3|J|0|B|7|0|0^^$0|@$1|2|3|4|5|6|7|W|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|X|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Y|8|@$I|Z|J|10|K|L]]|9|@]|A|$]]|$1|M|3|N|5|6|7|11|8|@]|9|@$I|12|J|13|1|14]]|A|$]]|$1|O|3|-4|5|6|7|15|8|@]|9|@]|A|$]]]|P|$Q|$5|R|S|T|A|$U|V]]]]

This one-line solution requires no other utils/downloads:

<pre><code>git diff `git status -s |grep -v ^\ D |grep -v file/to/exclude.txt |cut -b4-`
</code></pre>

Where <code>file/to/exclude.txt</code> is the name of the file you would like to exclude, of course.

Edit: credit <a href="https://stackoverflow.com/users/281622/ksenzee">ksenzee</a> for fixing deleted files breaking the diff.

blocks|key|582250|text|相对于git根目录|type|unstyled|depth|inlineStyleRanges|entityRanges|data|582251|git+diff接受可选的排除|offset|length|style|CODE|582252|git+diff+--+":(exclude)thingToExclude"|code-block|syntax|javascript|582253|您可能想要添加一些通配符|582254|git+diff+--+":(exclude)*/thingToExclude/*"|582255|目标特定文件类型|582256|git+diff+--+":(exclude)*/$1/*.png"|582257|或者为您的dotfiles删除一个小脚本|582258|例如.bash_profile或.zshrc|582259|gde()+{
++++#+git+diff+exclude+files+or+folders+
++++#+usage:+
++++#+gde+fileOrFolderNameToExclude
++++git+diff+--+":(exclude)*/$1/*"
}|582260|entityMap^0|0|0|8|0|0|0|0|0|0|0|2|D|G|6|0|0^^$0|@$1|2|3|4|5|6|7|12|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|13|8|@$D|14|E|15|F|G]]|9|@]|A|$]]|$1|H|3|I|5|J|7|16|8|@]|9|@]|A|$K|L]]|$1|M|3|N|5|6|7|17|8|@]|9|@]|A|$]]|$1|O|3|P|5|J|7|18|8|@]|9|@]|A|$K|L]]|$1|Q|3|R|5|6|7|19|8|@]|9|@]|A|$]]|$1|S|3|T|5|J|7|1A|8|@]|9|@]|A|$K|L]]|$1|U|3|V|5|6|7|1B|8|@]|9|@]|A|$]]|$1|W|3|X|5|6|7|1C|8|@$D|1D|E|1E|F|G]|$D|1F|E|1G|F|G]]|9|@]|A|$]]|$1|Y|3|Z|5|J|7|1H|8|@]|9|@]|A|$K|L]]|$1|10|3|-4|5|6|7|1I|8|@]|9|@]|A|$]]]|11|$]]

<h2>Relative to the git root directory</h2>

<code>git diff</code> accepts an optional exclude

<pre><code>git diff -- ":(exclude)thingToExclude"
</code></pre>

<h2>You might want to add some wild cards</h2>

<pre><code>git diff -- ":(exclude)*/thingToExclude/*"
</code></pre>

<h2>Target specific file types</h2>

<pre><code>git diff -- ":(exclude)*/$1/*.png"
</code></pre>

<h3>Or drop a little script for your dotfiles</h3>

<h3>Such as <code>.bash_profile</code> or <code>.zshrc</code></h3>

<pre><code>gde() {
 # git diff exclude files or folders 
 # usage: 
 # gde fileOrFolderNameToExclude
 git diff -- ":(exclude)*/$1/*"
}
</code></pre>

blocks|key|582379|text|在现有答案的基础上，如果您想排除文件模式，而不管它在目录中的什么位置，请使用**的相应git+pathspec值|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|582380|git+diff+--+':!**/yarn.lock'|code-block|syntax|javascript|582381|entityMap|0|LINK|mutability|MUTABLE|url|https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefpathspecapathspec^0|12|2|17|C|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@$9|T|A|U|B|C]]|D|@$9|V|A|W|1|X]]|E|$]]|$1|F|3|G|5|H|7|Y|8|@]|D|@]|E|$I|J]]|$1|K|3|-4|5|6|7|Z|8|@]|D|@]|E|$]]]|L|$M|$5|N|O|P|E|$Q|R]]]]

Building on existing answers, if you want to exclude a file pattern no matter where it is in the directory, use the corresponding <a href="https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefpathspecapathspec" rel="noreferrer">git pathspec</a> value of <code>**</code>:
<pre><code>git diff -- ':!**/yarn.lock'
</code></pre>

blocks|key|582137|text|这很简单，你可以使用标准的unix命令来排除你想要的东西，这些命令在git+bash下是可用的，甚至在windows环境下也可以使用。下面的例子展示了如何排除pom.xml文件的diff，首先检查diff到master只针对文件名，然后使用'grep+-v‘排除你不想要的文件，然后再次运行diff到master+with+prepapred：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|582138|git+diff+master+`git+diff+--name-only+master+%7C+grep+-v+pom.xml`|code-block|syntax|javascript|582139|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

It's very simple, you can exclude what you want using standard unix commands, those commands are available under git bash even under windows environment. 
Below example shows how to exclude diff for pom.xml files, first check diff to master only for filenames, then using 'grep -v' exclude files which you don't want and then run again diff to master with prepapred list:

<pre><code>git diff master `git diff --name-only master | grep -v pom.xml`
</code></pre>

blocks|key|582171|text|我执行以下操作：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|582172|git+add+*pattern_to_exclude*
git+diff
git+reset+HEAD+.|code-block|syntax|javascript|582173|我知道这不是一个优雅的解决方案，有时也不能使用。如果你已经准备好了一些东西)，但是它不需要输入复杂的命令就能完成任务|582174|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

I do the following:

<pre><code>git add *pattern_to_exclude*
git diff
git reset HEAD .
</code></pre>

I know it's not an elegant solution and it sometimes canot be used (eg. if you already have stuff staged) , but it does the trick without having to type a complicated command

blocks|key|581759|text|类似于Ben+Roux's解决方案，但无论如何都是共享的：|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|581760|git+status+--porcelain+%7C+grep+-v+$PATTERN_TO_EXCLUDE+%7C+awk+'{print+$2}'+%7C+xargs+git+diff|code-block|syntax|javascript|581761|或者，如果更改已经在本地提交：|581762|git+diff+--name-only+origin/master+%7C+grep+-v+$PATTERN_TO_EXCLUDE+%7C+xargs+git+diff+origin/master|581763|示例：|581764|git+status+--porcelain+%7C+grep+-v+docs+%7C+awk+'{print+$2}'+%7C+xargs+git+diff+origin/master

git+diff+--name-only+origin/master+%7C+grep+-v+docs+%7C+xargs+git+diff+origin/master|581765|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/users/779919/ben-roux^0|3|A|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@$A|Z|B|10|1|11]]|C|$]]|$1|D|3|E|5|F|7|12|8|@]|9|@]|C|$G|H]]|$1|I|3|J|5|6|7|13|8|@]|9|@]|C|$]]|$1|K|3|L|5|F|7|14|8|@]|9|@]|C|$G|H]]|$1|M|3|N|5|6|7|15|8|@]|9|@]|C|$]]|$1|O|3|P|5|F|7|16|8|@]|9|@]|C|$G|H]]|$1|Q|3|-4|5|6|7|17|8|@]|9|@]|C|$]]]|R|$S|$5|T|U|V|C|$W|X]]]]

similar to <a href="https://stackoverflow.com/users/779919/ben-roux">Ben Roux's</a> solution, but sharing anyway:

<pre><code>git status --porcelain | grep -v $PATTERN_TO_EXCLUDE | awk '{print $2}' | xargs git diff
</code></pre>

or, if the changes have already be committed locally:

<pre><code>git diff --name-only origin/master | grep -v $PATTERN_TO_EXCLUDE | xargs git diff origin/master
</code></pre>

Examples:

<pre><code>git status --porcelain | grep -v docs | awk '{print $2}' | xargs git diff origin/master

git diff --name-only origin/master | grep -v docs | xargs git diff origin/master
</code></pre>

blocks|key|582018|text|如果您只想在视觉上检查diff，一个可视的diff工具(如Meld)将允许您使用易于记忆的简短命令来执行此操作。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|582019|首先，设置一个diff工具，如果你还没有这样做。|582020|$+git+config+--global+diff.tool+=+meld|code-block|syntax|javascript|582021|然后，您可以运行目录diff。|582022|$+git+difftool+--dir-diff|582023|您将能够在Meld+(或您选择的工具)中浏览差异(通过文件)。简单地说，不要打开你想忽略的文件。|582024|entityMap|0|LINK|mutability|MUTABLE|url|http://meldmerge.org/^0|T|4|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@$A|Z|B|10|1|11]]|C|$]]|$1|D|3|E|5|6|7|12|8|@]|9|@]|C|$]]|$1|F|3|G|5|H|7|13|8|@]|9|@]|C|$I|J]]|$1|K|3|L|5|6|7|14|8|@]|9|@]|C|$]]|$1|M|3|N|5|H|7|15|8|@]|9|@]|C|$I|J]]|$1|O|3|P|5|6|7|16|8|@]|9|@]|C|$]]|$1|Q|3|-4|5|6|7|17|8|@]|9|@]|C|$]]]|R|$S|$5|T|U|V|C|$W|X]]]]

If you want to do this only to visually inspect the diff, a visual diff tool (like <a href="http://meldmerge.org/" rel="nofollow noreferrer">Meld</a>) will let you do it with a short command that's easy to remember.

First, set up a diff tool if you haven't already.

<pre><code>$ git config --global diff.tool = meld
</code></pre>

Then, you can run a directory diff. 

<pre><code>$ git difftool --dir-diff
</code></pre>

You'll be able to browse diffs (by file) in Meld (or your tool of choice). Simply don't open the file you want to ignore.

blocks|key|366602|text|git+diff+remote/master..master+--name-only+--+':!README.rst'|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|366603|给我的(git版本2.11.0)|unstyled|366604|fatal:+There+is+nothing+to+exclude+from+by+:(exclude)+patterns.
Perhaps+you+forgot+to+add+either+':/'+or+'.'+?|366605|git+diff+remote/master..master+--name-only+--+'./*'+':!README.rst'|366606|工作得很好，来源：https://stackoverflow.com/a/30084612/5155484|offset|length|366607|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/a/30084612/5155484^0|0|0|0|0|9|18|0|0^^$0|@$1|2|3|4|5|6|7|W|8|@]|9|@]|A|$B|C]]|$1|D|3|E|5|F|7|X|8|@]|9|@]|A|$]]|$1|G|3|H|5|6|7|Y|8|@]|9|@]|A|$B|C]]|$1|I|3|J|5|6|7|Z|8|@]|9|@]|A|$B|C]]|$1|K|3|L|5|F|7|10|8|@]|9|@$M|11|N|12|1|13]]|A|$]]|$1|O|3|-4|5|F|7|14|8|@]|9|@]|A|$]]]|P|$Q|$5|R|S|T|A|$U|V]]]]

<pre class="lang-sh prettyprint-override"><code>git diff remote/master..master --name-only -- ':!README.rst'
</code></pre>
Gave me (git version 2.11.0)
<pre><code>fatal: There is nothing to exclude from by :(exclude) patterns.
Perhaps you forgot to add either ':/' or '.' ?
</code></pre>
<pre class="lang-sh prettyprint-override"><code>git diff remote/master..master --name-only -- './*' ':!README.rst'
</code></pre>
Worked nicely, source: <a href="https://stackoverflow.com/a/30084612/5155484">https://stackoverflow.com/a/30084612/5155484</a>

I am trying to exclude a file (<code>db/irrelevant.php</code>) from a Git diff. I have tried putting a file in the <code>db</code> subdirectory called <code>.gitattributes</code> with the line <code>irrelevant.php -diff</code>
and I have also tried creating a file called <code>.git/info/attributes</code> containing <code>db/irrelevant.php</code>. 

In all cases, the <code>db/irrelevant.php</code> file is included in the diff as a Git binary patch. What I want is for the changes to that file to be ignore by the diff command. What am I doing wrong?

Want to exclude file from "git diff"

我正在尝试从Git diff中排除一个文件(db/irrelevant.php)。我已经尝试将一个名为.gitattributes的文件放到db子目录中，并使用irrelevant.php -diff行，我还尝试创建了一个名为.git/info/attributes的文件，其中包含db/irrelevant.php。在所有情况下，db/irrelevant.php文件都作为Git二进制补丁包含在d

问想要从"git diff“中排除文件
EN

回答 13

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问想要从"git diff“中排除文件EN

回答 13

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问想要从"git diff“中排除文件
EN