blocks|key|924227|text|只需运行不带任何参数的git+diff或git+diff+--+newfilename。git足够智能，可以比较正确的文件/内容(例如，重命名前的原始内容与重命名后更改的内容)|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|924228|entityMap^0|B|8|K|N|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]|$9|K|A|L|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|M|8|@]|D|@]|E|$]]]|G|$]]

simply run <code>git diff</code> without any arguments, or <code>git diff -- newfilename</code>. git is smart enough to compare the right files/contents (i.e. original content before rename with altered content after rename)

blocks|key|707906|text|除了knittl+wrote之外，您还可以使用：|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|707907|git+diff+HEAD:./oldfilename+newfilename|code-block|syntax|javascript|707908|其中HEAD:./oldfilename表示相对于当前目录的最后一次提交(在HEAD中)中的旧文件名。|style|CODE|707909|如果你没有足够新的git，你将不得不使用：|707910|git+diff+HEAD:path/to/oldfilename+newfilename|707911|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/questions/5730460/git-diff-on-moved-file/5730597#5730597^0|2|C|0|0|0|2|I|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|@$A|14|B|15|K|L]]|9|@]|C|$]]|$1|M|3|N|5|6|7|16|8|@]|9|@]|C|$]]|$1|O|3|P|5|F|7|17|8|@]|9|@]|C|$G|H]]|$1|Q|3|-4|5|6|7|18|8|@]|9|@]|C|$]]]|R|$S|$5|T|U|V|C|$W|X]]]]

In addition to what <a href="https://stackoverflow.com/questions/5730460/git-diff-on-moved-file/5730597#5730597">knittl wrote</a>, you can always use:

<pre><code>git diff HEAD:./oldfilename newfilename
</code></pre>

where <code>HEAD:./oldfilename</code> means oldfilename in the last commit (in HEAD), relative to current directory.

If you don't have new enough git, you would have to use instead:

<pre><code>git diff HEAD:path/to/oldfilename newfilename
</code></pre>

blocks|key|707952|text|不管出于什么原因，使用HEAD:./oldfilename+(或绝对路径)对我不起作用，但HEAD:oldfilename确实起到了作用(感谢cmn)：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|707953|git+diff+HEAD:oldfilename+newfilename
git+diff+2a80f45:oldfilename+f65f3b3:newfilename|code-block|syntax|javascript|707954|HTH|707955|entityMap^0|B|I|19|G|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@$9|P|A|Q|B|C]|$9|R|A|S|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|T|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|U|8|@]|D|@]|E|$]]|$1|M|3|-4|5|6|7|V|8|@]|D|@]|E|$]]]|N|$]]

For whatever reason using <code>HEAD:./oldfilename</code> (or absolute path) didn’t work for me, but <code>HEAD:oldfilename</code> did (thanks cmn):

<pre><code>git diff HEAD:oldfilename newfilename
git diff 2a80f45:oldfilename f65f3b3:newfilename
</code></pre>

HTH

blocks|key|708004|text|你需要使用-M让git在区分时自动检测移动的文件。就像奈特尔提到的那样，只使用git+diff对我来说不起作用。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|708005|所以很简单：git+diff+-M应该做到这一点。|708006|此交换机的文档如下：|708007|-M[<n>],+--find-renames[=<n>]
+++++++Detect+renames.+If+n+is+specified,+it+is+a+threshold+on+the+similarity+index+
+++++++(i.e.+amount+of+addition/deletions+compared+to+the+file’s+size).+For+example,+
+++++++-M90%25+means+git+should+consider+a+delete/add+pair+to+be+a+rename+if+more+than
+++++++90%25+of+the+file+hasn’t+changed.|code-block|syntax|javascript|708008|entityMap^0|13|8|0|6|B|0|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@$9|R|A|S|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|T|8|@$9|U|A|V|B|C]]|D|@]|E|$]]|$1|H|3|I|5|6|7|W|8|@]|D|@]|E|$]]|$1|J|3|K|5|L|7|X|8|@]|D|@]|E|$M|N]]|$1|O|3|-4|5|6|7|Y|8|@]|D|@]|E|$]]]|P|$]]

You need to use -M to let git autodetect the moved file when diffing. Using just <code>git diff</code> as knittl mentioned does not work for me.

So simply: <code>git diff -M</code> should do it.

The documentation for this switch is:

<pre><code>-M[&lt;n&gt;], --find-renames[=&lt;n&gt;]
 Detect renames. If n is specified, it is a threshold on the similarity index 
 (i.e. amount of addition/deletions compared to the file’s size). For example, 
 -M90% means git should consider a delete/add pair to be a rename if more than
 90% of the file hasn’t changed.
</code></pre>

blocks|key|708083|text|正如其他人所说的那样，git+diff+-M激活了重命名检测(正如@VonC指出的那样，它是从Git2.9默认激活的)。但是，如果您有一个较大的更改集，不精确的重命名检测仍可能再次被关闭。Git将显示如下警告，在您正在查看的差异中很容易遗漏：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|708084|warning:+inexact+rename+detection+was+skipped+due+to+too+many+files.
warning:+you+may+want+to+set+your+diff.renameLimit+variable+to+at+least+450+and+retry+the+command.|code-block|syntax|javascript|708085|在这种情况下，按照git的建议设置配置选项，例如|708086|git+config+diff.renamelimit+450|708087|然后重新运行diff命令。|708088|entityMap^0|B|B|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@$9|T|A|U|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|V|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|W|8|@]|D|@]|E|$]]|$1|M|3|N|5|H|7|X|8|@]|D|@]|E|$I|J]]|$1|O|3|P|5|6|7|Y|8|@]|D|@]|E|$]]|$1|Q|3|-4|5|6|7|Z|8|@]|D|@]|E|$]]]|R|$]]

<code>git diff -M</code> activates rename detection as others have said (and as @VonC pointed out, it is activated by default from git 2.9). But if you have a large changeset, inexact rename detection may still get turned off again. Git will display a warning like the following, which is easy to miss amidst the diff you are viewing:

<pre><code>warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your diff.renameLimit variable to at least 450 and retry the command.
</code></pre>

In that case, set the configuration option as suggested by git, for example

<pre><code>git config diff.renamelimit 450
</code></pre>

and re-run your diff command.

I moved a file using <code>git mv</code>. Now I would like to do a diff on the new file to compare it with the old file (with the old, now non-existent name). 

How do I do this?

How to do a git diff on moved/renamed file?

我使用git mv移动了一个文件。现在我想对新文件做一个比较，将它与旧文件(使用旧的，现在不存在的名称)进行比较。我该怎么做呢？

问如何对已移动/重命名的文件进行git比较？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何对已移动/重命名的文件进行git比较？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何对已移动/重命名的文件进行git比较？
EN