blocks|key|1865591|text|要查看从远程文件到本地文件的差异，请执行以下操作：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1865592|git+diff+remotename/branchname:remote/path/file1.txt+local/path/file1.txt|code-block|syntax|javascript|1865593|要查看另一个方向的差异，请执行以下操作：|1865594|git+diff+HEAD:local/path/file1.txt+remotename/branchname:remote/path/file1.txt|1865595|基本上，您可以使用此表示法在任何位置比较任何两个文件：|1865596|git+diff+ref1:path/to/file1+ref2:path/to/file2|1865597|通常，ref1和ref2可以是分支名称、远程名称/分支名称、提交SHA等。|offset|length|style|CODE|1865598|entityMap^0|0|0|0|0|0|0|3|4|8|4|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]|$Q|15|R|16|S|T]]|9|@]|A|$]]|$1|U|3|-4|5|6|7|17|8|@]|9|@]|A|$]]]|V|$]]

To view the differences going from the remote file to the local file:

<pre><code>git diff remotename/branchname:remote/path/file1.txt local/path/file1.txt
</code></pre>

To view the differences in the other direction:

<pre><code>git diff HEAD:local/path/file1.txt remotename/branchname:remote/path/file1.txt
</code></pre>

Basically you can diff any two files anywhere using this notation:

<pre><code>git diff ref1:path/to/file1 ref2:path/to/file2
</code></pre>

As usual, <code>ref1</code> and <code>ref2</code> could be branch names, remotename/branchname, commit SHAs, etc.

blocks|key|1865697|text|为此，我编写了一个Bash脚本：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1865698|#set+-x
branchname=`git+branch+%7C+grep+-F+'*'+%7C++awk+'{print+$2}'`
echo+$branchname
git+fetch+origin+${branchname}
for+file+in+`git+status+%7C+awk+'{if+($1+==+"modified:")+print+$2;}'`
do
echo+"PLEASE+CHECK+OUT+GIT+DIFF+FOR+"$file
git+difftool++FETCH_HEAD+$file+;
done|code-block|syntax|javascript|1865699|在上面的脚本中，我将远程主分支(不一定是它的主分支-+any分支)获取到FETCH_HEAD，只列出我修改过的文件，并将修改后的文件与git+difftool进行比较。|offset|length|style|CODE|1865700|Git支持的difftool有很多，我配置了Meld+Diff+Viewer来比较好的图形用户界面。|1865701|从上面的脚本中，我预先知道了在遵循Git+stages+untracked→stages→commit之前，同一文件中的其他团队所做的更改，这有助于我避免不必要的解决与远程团队的合并冲突，或者创建一个新的本地分支，并在主分支上进行比较和合并。|1865702|entityMap^0|0|0|10|A|1V|C|0|6|8|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|@$I|V|J|W|K|L]|$I|X|J|Y|K|L]]|9|@]|A|$]]|$1|M|3|N|5|6|7|Z|8|@$I|10|J|11|K|L]]|9|@]|A|$]]|$1|O|3|P|5|6|7|12|8|@]|9|@]|A|$]]|$1|Q|3|-4|5|6|7|13|8|@]|9|@]|A|$]]]|R|$]]

For that I wrote a Bash script:
<pre><code>#set -x
branchname=`git branch | grep -F '*' | awk '{print $2}'`
echo $branchname
git fetch origin ${branchname}
for file in `git status | awk '{if ($1 == &quot;modified:&quot;) print $2;}'`
do
echo &quot;PLEASE CHECK OUT GIT DIFF FOR &quot;$file
git difftool FETCH_HEAD $file ;
done
</code></pre>
In the above script, I fetch the remote main branch (not necessarily its master branch - any branch) to <code>FETCH_HEAD</code>, make a list of my modified file only, and compare modified files to <code>git difftool</code>.
There are many <code>difftool</code> supported by Git, I configured Meld Diff Viewer for good GUI comparison.
From the above script, I have prior knowledge what changes done by other teams in the same file before I follow the Git stages untracked → staged → commit, which help me to avoid unnecessary resolve merge conflict with a remote team or make a new local branch and compare and merge on the main branch.

blocks|key|1865779|text|要比较本地存储库和远程存储库，只需使用以下语法：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1865780|git+diff+@{upstream}|code-block|syntax|javascript|1865781|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|$]]

To compare the local repository with the remote one, simply use the below syntax:
<pre class="lang-sh prettyprint-override"><code>git diff @{upstream}
</code></pre>

blocks|key|2079454|text|我尝试了几种解决方案，但我认为一种简单的方法是这样的(您在本地文件夹中)：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2079455|#!/bin/bash
git+fetch

var_local=`cat+.git/refs/heads/master`
var_remote=`git+log+origin/master+-1+%7C+head+-n1+%7C+cut+-d"+"+-f2`

if+[+"$var_remote"+=+"$var_local"+];+then
++++echo+"Strings+are+equal."+#1
else
++++echo+"Strings+are+not+equal."+#+0+if+you+want
fi|code-block|syntax|javascript|2079456|运行此脚本后，您将使用上次提交编号完成本地Git和远程Git的比较。|2079457|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 tried a couple of solutions, but I think an easy way is like this (you are in the local folder):
<pre><code>#!/bin/bash
git fetch

var_local=`cat .git/refs/heads/master`
var_remote=`git log origin/master -1 | head -n1 | cut -d&quot; &quot; -f2`

if [ &quot;$var_remote&quot; = &quot;$var_local&quot; ]; then
 echo &quot;Strings are equal.&quot; #1
else
 echo &quot;Strings are not equal.&quot; # 0 if you want
fi
</code></pre>
After running this script, you will be finished comparing the local Git and remote Git using the last commit number.

blocks|key|1865891|text|要检查当前分支：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1865892|git+diff+--+projects/components/some.component.ts+...+origin
git+diff+--+projects/components/some.component.html+...+origin|code-block|syntax|javascript|1865893|要检查其他分支，可以使用staging：|1865894|git+diff+--+projects/components/some.component.ts+...+origin/staging
git+diff+--+projects/components/some.component.html+...+origin/staging|1865895|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|N|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|O|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|K|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|L|$]]

To check with the current branch:
<pre><code>git diff -- projects/components/some.component.ts ... origin
git diff -- projects/components/some.component.html ... origin
</code></pre>
To check with some other branch, say staging:
<pre><code>git diff -- projects/components/some.component.ts ... origin/staging
git diff -- projects/components/some.component.html ... origin/staging
</code></pre>

I want to find the differences between a file I have in my local repository vs. what is in the <code>origin master</code>.
I know that there is <code>git diff</code>. However, I just want to isolate it down to this one particular file.
For simplicity, let’s say the file is named <code>file1.txt</code> and it has a local file path = <code>[local_path]</code> and in the origin it has filepath = <code>[remote-path]</code>.
What would be the Git command I need to type?
<hr/>
For those that are using <a href="https://en.wikipedia.org/wiki/Eclipse_%28software%29" rel="noreferrer">Eclipse</a>, I just found out that you can just right click → Compare With → Branch, Tag or Reference → select the appropriate version and there you go.

Difference between file in local repository and origin

我想找出本地存储库中的文件与origin master中的文件之间的差异。我知道有git diff。但是，我只想将它隔离到这一个特定的文件。为简单起见，假设文件名为file1.txt，它有一个本地文件路径= [local_path]，在源文件中，它有一个文件路径= [remote-path]。我需要输入的Git命令是什...

问本地存储库中的文件与源文件之间的差异
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问本地存储库中的文件与源文件之间的差异EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问本地存储库中的文件与源文件之间的差异
EN