您当前的位置： 首页 > 学无止境 > 心得笔记 网站首页心得笔记

25 看看不同提交的指定文件的...

发布时间：2020-07-19 11:33:25编辑：雪饮阅读（）

有时候我们需要在两个分支之间比较差异。

首先我们这里有分支如下

xy@DESKTOP-BG9HNHK MINGW64 ~/Desktop/web/web (branch3|REBASE 4/5)

$ git branch

* (no branch, rebasing branch3)

  branch2

  branch3

  master

  temp

那么这里我希望比较下branch2和branch3之间的差异，则有

xy@DESKTOP-BG9HNHK MINGW64 ~/Desktop/web/web (branch3|REBASE 4/5)

$ git diff branch2 branch3

diff --git a/2.txt b/2.txt

new file mode 100644

index 0000000..bf7e899

--- /dev/null

+++ b/2.txt

@@ -0,0 +1 @@

+asdasd

diff --git a/20200704.txt b/20200704.txt

new file mode 100644

index 0000000..e69de29

diff --git a/branch2dir1/1.txt b/branch2dir1/1.txt

deleted file mode 100644

index 65a5b81..0000000

--- a/branch2dir1/1.txt

+++ /dev/null

那么如果我只想比对这两个分支之间某个指定文件的差异，则有

xy@DESKTOP-BG9HNHK MINGW64 ~/Desktop/web/web (branch3|REBASE 4/5)

$ git diff branch2 branch3 -- index.md

由于两个分支之间的比较其实也就是两个commit之间的比较，所以两个分支之间的比较还可以这样

先找出我们要比对的这两个分支的commit的id

xy@DESKTOP-BG9HNHK MINGW64 ~/Desktop/web/web (branch3|REBASE 4/5)

$ git branch -av

* (no branch, rebasing branch3) 45bc9f2 addWithCommit

  branch2                       9979ccc branch2dir3

  branch3                       b07d738 modify 2.txt

  master                        48142d3 [ahead 1] modified index.html

  temp                          48142d3 modified index.html

  remotes/origin/HEAD           -> origin/master

  remotes/origin/master         b0babbd index

则有

xy@DESKTOP-BG9HNHK MINGW64 ~/Desktop/web/web (branch3|REBASE 4/5)

$ git diff 9979ccc b07d738

diff --git a/2.txt b/2.txt

new file mode 100644

index 0000000..bf7e899

--- /dev/null

+++ b/2.txt

@@ -0,0 +1 @@

+asdasd

diff --git a/20200704.txt b/20200704.txt

new file mode 100644

index 0000000..e69de29

diff --git a/branch2dir1/1.txt b/branch2dir1/1.txt

deleted file mode 100644

index 65a5b81..0000000

--- a/branch2dir1/1.txt

+++ /dev/null

那么指定文件进行比对也是一样咯

xy@DESKTOP-BG9HNHK MINGW64 ~/Desktop/web/web (branch3|REBASE 4/5)

$ git diff 9979ccc b07d738 -- index.md