blocks|key|4534944|text|下面的方法对我很有效：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|4534945|git+diff+master:foo+foo|offset|length|style|CODE|4534946|在过去，它可能是：|4534947|git+diff+foo+master:foo|4534948|entityMap^0|0|0|N|0|0|0|N|0^^$0|@$1|2|3|4|5|6|7|N|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|O|8|@$D|P|E|Q|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|R|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|S|8|@$D|T|E|U|F|G]]|9|@]|A|$]]|$1|L|3|-4|5|6|7|V|8|@]|9|@]|A|$]]]|M|$]]

The following works for me:

<code>git diff master:foo foo</code>

In the past, it may have been:

<code>git diff foo master:foo</code>

blocks|key|4534979|text|还有：git+diff+master..feature+foo|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|4534980|因为git+diff+foo+master:foo对我的目录不起作用。|4534981|entityMap^0|3|S|0|2|N|0^^$0|@$1|2|3|4|5|6|7|J|8|@$9|K|A|L|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|M|8|@$9|N|A|O|B|C]]|D|@]|E|$]]|$1|H|3|-4|5|6|7|P|8|@]|D|@]|E|$]]]|I|$]]

Also: <code>git diff master..feature foo</code>

Since <code>git diff foo master:foo</code> doesn't work on directories for me.

blocks|key|4534989|text|git+difftool+tag/branch+filename|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|4534990|unstyled|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|G|8|@]|9|@]|A|$B|C]]|$1|D|3|-4|5|E|7|H|8|@]|9|@]|A|$]]]|F|$]]

<pre><code>git difftool tag/branch filename
</code></pre>

blocks|key|481095|text|您正在尝试将您的工作树与特定的分支名称进行比较，因此您需要这样：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|481096|git+diff+master+--+foo|code-block|syntax|javascript|481097|它来自这种形式的git-diff+(参见git-diff手册页)|481098|+++git+diff+[--options]+<commit>+[--]+[<path>...]
+++++++This+form+is+to+view+the+changes+you+have+in+your+working+tree
+++++++relative+to+the+named+<commit>.+You+can+use+HEAD+to+compare+it+with
+++++++the+latest+commit,+or+a+branch+name+to+compare+with+the+tip+of+a
+++++++different+branch.|481099|仅供参考，还有一个--cached+(又名--staged)选项，用于查看您已暂存的内容的差异，而不是查看工作树中的所有内容：|offset|length|style|CODE|481100|+++git+diff+[--options]+--cached+[<commit>]+[--]+[<path>...]
+++++++This+form+is+to+view+the+changes+you+staged+for+the+next+commit
+++++++relative+to+the+named+<commit>.
+++++++...
+++++++--staged+is+a+synonym+of+--cached.|481101|entityMap^0|0|0|0|0|9|8|L|8|0|0^^$0|@$1|2|3|4|5|6|7|U|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|V|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|W|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|X|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|Y|8|@$M|Z|N|10|O|P]|$M|11|N|12|O|P]]|9|@]|A|$]]|$1|Q|3|R|5|D|7|13|8|@]|9|@]|A|$E|F]]|$1|S|3|-4|5|6|7|14|8|@]|9|@]|A|$]]]|T|$]]

You're trying to compare your working tree with a particular branch name, so you want this:

<pre><code>git diff master -- foo
</code></pre>

Which is from this form of git-diff (see the git-diff manpage)

<pre><code> git diff [--options] &lt;commit&gt; [--] [&lt;path&gt;...]
 This form is to view the changes you have in your working tree
 relative to the named &lt;commit&gt;. You can use HEAD to compare it with
 the latest commit, or a branch name to compare with the tip of a
 different branch.
</code></pre>

FYI, there is also a <code>--cached</code> (aka <code>--staged</code>) option for viewing the diff of what you've staged, rather than everything in your working tree:

<pre><code> git diff [--options] --cached [&lt;commit&gt;] [--] [&lt;path&gt;...]
 This form is to view the changes you staged for the next commit
 relative to the named &lt;commit&gt;.
 ...
 --staged is a synonym of --cached.
</code></pre>

blocks|key|497028|text|git+diff+mybranch+master+--+file|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|497029|也应该行得通|unstyled|497030|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$B|C]]|$1|D|3|E|5|F|7|J|8|@]|9|@]|A|$]]|$1|G|3|-4|5|F|7|K|8|@]|9|@]|A|$]]]|H|$]]

<pre><code>git diff mybranch master -- file
</code></pre>

should also work

blocks|key|497053|text|查看与当前分支相比的本地更改|type|unstyled|depth|inlineStyleRanges|entityRanges|data|497054|git+diff+.|code-block|syntax|javascript|497055|要查看与任何其他现有分支相比本地发生的更改|497056|git+diff+<branch-name>+.|497057|查看特定文件的更改|497058|git+diff+<branch-name>+--+<file-path>|497059|确保在开始时运行git+fetch。|offset|length|style|CODE|497060|entityMap^0|0|0|0|0|0|0|8|9|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|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|Z|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|10|8|@]|9|@]|A|$]]|$1|M|3|N|5|D|7|11|8|@]|9|@]|A|$E|F]]|$1|O|3|P|5|6|7|12|8|@$Q|13|R|14|S|T]]|9|@]|A|$]]|$1|U|3|-4|5|6|7|15|8|@]|9|@]|A|$]]]|V|$]]

To see local changes compare to your current branch

<pre><code>git diff .
</code></pre>

To see local changed compare to any other existing branch

<pre><code>git diff &lt;branch-name&gt; .
</code></pre>

To see changes of a particular file

<pre><code>git diff &lt;branch-name&gt; -- &lt;file-path&gt;
</code></pre>

Make sure you run <code>git fetch</code> at the beginning.

blocks|key|480350|text|假设您有一个名为master的分支和一个名为feature的分支，并且您希望检查一个名为my_file的特定文件，然后：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|480351|480352|git+diff+master..feature+/Path/to/my_file显示分支master上提交的my_file版本之间的差异，feature.|ordered-list-item|480353|git+diff+master+--+/Path/to/my_file显示工作目录(未转移的文件)和my_file.|480354|分支master之间的差异|480355|entityMap^0|8|6|M|7|18|7|0|0|0|15|19|6|1J|7|1Y|7|0|0|Z|1E|7|0|2|6|0^^$0|@$1|2|3|4|5|6|7|P|8|@$9|Q|A|R|B|C]|$9|S|A|T|B|C]|$9|U|A|V|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|W|8|@]|D|@]|E|$]]|$1|G|3|H|5|I|7|X|8|@$9|Y|A|Z|B|C]|$9|10|A|11|B|C]|$9|12|A|13|B|C]|$9|14|A|15|B|C]]|D|@]|E|$]]|$1|J|3|K|5|I|7|16|8|@$9|17|A|18|B|C]|$9|19|A|1A|B|C]]|D|@]|E|$]]|$1|L|3|M|5|6|7|1B|8|@$9|1C|A|1D|B|C]]|D|@]|E|$]]|$1|N|3|-4|5|6|7|1E|8|@]|D|@]|E|$]]]|O|$]]

lets say you have a branch named <code>master</code> and a branch named <code>feature</code>, and you want to check a specific file called <code>my_file</code>, then:
<ol>
<li><code>git diff master..feature /Path/to/my_file</code> shows the diff between the commited versions of <code>my_file</code> on branch <code>master</code> and <code>feature</code>.</li>
<li><code>git diff master -- /Path/to/my_file</code> shows the difference between the working directory (the un-staged files) and the branch <code>master</code> of <code>my_file</code>.</li>
</ol>

blocks|key|480372|text|同样有效的方法：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|480373|git+diff+master+./relative-path-to-foo|code-block|syntax|javascript|480374|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|$]]

What also works:
<pre><code>git diff master ./relative-path-to-foo
</code></pre>

I have a repo with file <code>foo</code> in the master branch. I switched to bar branch and made some changes to <code>foo</code>. How can I now run a <code>git diff</code> between this copy (which isn't committed yet) and the copy of the master branch?

diff current working copy of a file with another branch's committed copy

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

我在主分支中有一个包含文件foo的存储库。我切换到bar分支，并对foo进行了一些更改。现在如何在此副本(尚未提交)和主分支的副本之间运行git diff？

问将一个文件的当前工作副本与另一个分支的已提交副本进行比较
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问将一个文件的当前工作副本与另一个分支的已提交副本进行比较EN