git log -p vs. git show vs. git diff [英] git log -p vs. git show vs. git diff

问题描述

git log -p，git show和git diff命令之间的关系如何，为什么一个在另一个上使用?

How are the commands git log -p, git show, and git diff related and why would one be used over another?

通过以下4次提交给出一个回购协议:

Given a repo with the following 4 commits:

已提交-上一次提交
commitc
commitb
coomita-初始提交

commitd - last commit
commitc
commitb
coomita - initial commit

以下git命令之间有什么区别?:

What are the differences between the following git commands?:

git log -p commitb commitd  
git show commitb commitd  
git diff commitb commitd  

git log -p commitd commitb  
git show commitd commitb  
git diff commitd commitb  

git log -p commitb..commitd  
git show commitb..commitd  
git diff commitb..commitd

git log -p commitd..commitb  
git show commitd..commitb  
git diff commitd..commitb

git log -p commitb...commitd  
git show commitb...commitd  
git diff commitb...commitd

git log -p commitd...commitb  
git show commitd...commitb  
git diff commitd...commitb

推荐答案

git log A B显示两个提交A和B的历史记录(基本上为每个提交的历史记录生成并集).通常，您需要git log A..B，它也可以写为git log ^B A(显示从A可以访问的所有内容，但从B显示不是(^)).此范围也可以为空(例如，B..A将为空，因为从B到达的每个提交也可以从A到达).因此，当与错误"参数一起使用时，您也不会从git log获得任何输出.

git log A B shows the history of both commits A and B (basically generating a union set of each commits' history). Usually you want git log A..B, which can also be written as git log ^B A (show everything reachable from A, but not (^) from B). This range can also be empty (for instance B..A would be empty, since every commit reachable from B is also reachable from A). Therefore, you also get no output from git log when used with the "wrong" arguments.

git show是非常通用的命令，根据其参数会产生不同的输出.您可以传递一个或多个提交，它将向您显示提交信息(作者，时间戳，提交消息，与先前提交的差异).诸如a..d之类的提交范围将得到解决，并且每个提交都单独显示.您还可以传递路径，git show将为您显示文件的内容.您也可以使用语法commit:path/to/file指定某个版本的文件.如果您传递目录，git show将显示更改该目录的最后一次提交的提交信息.

git show is a very versatile command and produces different output depending on its arguments. You can pass one or several commits and it will show you the commit information (authorship, timestamp, commit message, diff from previous commit). Commit ranges such as a..d will be resolved and each commit is shown individually. You can also pass a path and git show will show you the file's contents. You can also specify a file at a certain revision with the syntax commit:path/to/file. If you pass a directory, git show will display the commit information of the last commit changing that directory.

git diff通常期望比较两个树或两个文件. (它也可以不使用任何参数，而是比较索引/临时区域).提交会自动 unwrapped 到其相应的树中(树对象描述了存储库的某种状态).对于差异情况，语法A..B被静默解析为A B，并且将显示从commit/tree A到B

git diff generally expects two trees or two files to compare. (It can also take no arguments and compare the index/staging area instead). A commit is automatically unwrapped into its corresponding tree (a tree object describes a certain state of the repository). The syntax A..B is silently resolved to A B for the diff case and will show the changes required to get from commit/tree A to B

范围A...B的意思是每个提交都可以从A或B到达，但不能从两者都到达".

The range A...B means "every commit reachable from A or B, but not from both".

• 与git log一起使用时，它将向您显示这些提交，并且仅在与不同分支一起使用时才有意义，即显示两个之间的所有不同之处，但隐藏两个分支具有相同之处的那些提交"./li>
• 对于git diff，此语法是git diff $(git merge-base A B) B的语法糖，即由于A的历史发散而导致B的变化.
• 使用git show，您将只获得该范围内每次提交的提交信息.

• When used with git log it will show you those commits and it mostly only makes sense when used with diverged branches, i.e. "show every that's different between the two, but hide those commits which both branches have in common".
• For git diff this syntax is syntactic sugar for git diff $(git merge-base A B) B, i.e. "changes in B since the history of A diverged.
• With git show you will simply get commit information for each single commit in that range.

如果仍然不清楚，请在评论中让我知道.

If anything's still unclear let me know in the comments.

以下是您在原始问题中发布的存储库的输出:

Here's the output the repository you posted in your original question:

$ git init
 Initialized empty Git repository in ...
$  cd SO
$ ls
$ echo a > a
$ git add a
$ git commit
[master (root-commit) 7b66fe5] initial commit
 1 file changed, 1 insertion(+)
 create mode 100644 a
$ git tag a
$ echo b >> a
$ echo b > b
$ git add a b
$ git commit
[master ee884fe] commit b
 2 files changed, 2 insertions(+)
 create mode 100644 b
$ git tag b
$ echo c >> a
$ echo c >> b
$ echo c > c
$ git add a b c
$ git commit
[master 8abaaff] commit c
 3 files changed, 3 insertions(+)
 create mode 100644 c
$ git tag c
$ echo d >> a
$ echo d > b
$ git add a b
$ git commit
[master 08adc85] commit d
 2 files changed, 2 insertions(+), 2 deletions(-)
$ git tag d
$ git log -p b d --
commit 08adc8512e63588e6f01533b2a0f762342521b05
Author: ...
Date:   Mon Sep 1 17:22:06 2014 +0200

    commit d

diff --git a/a b/a
index de98044..d68dd40 100644
--- a/a
+++ b/a
@@ -1,3 +1,4 @@
 a
 b
 c
+d
diff --git a/b b/b
index 9ddeb5c..4bcfe98 100644
--- a/b
+++ b/b
@@ -1,2 +1 @@
-b
-c
+d

commit 8abaaff681be0bcaa16c946feb2989959348c9f4
Author: ...
Date:   Mon Sep 1 17:21:40 2014 +0200

    commit c

diff --git a/a b/a
index 422c2b7..de98044 100644
--- a/a
+++ b/a
@@ -1,2 +1,3 @@
 a
 b
+c
diff --git a/b b/b
index 6178079..9ddeb5c 100644
--- a/b
+++ b/b
@@ -1 +1,2 @@
 b
+c
diff --git a/c b/c
new file mode 100644
index 0000000..f2ad6c7
--- /dev/null
+++ b/c
@@ -0,0 +1 @@
+c

commit ee884fea5d0266280845348175ac0af5083a9bbf
Author: ...
Date:   Mon Sep 1 17:21:05 2014 +0200

    commit b

diff --git a/a b/a
index 7898192..422c2b7 100644
--- a/a
+++ b/a
@@ -1 +1,2 @@
 a
+b
diff --git a/b b/b
new file mode 100644
index 0000000..6178079
--- /dev/null
+++ b/b
@@ -0,0 +1 @@
+b

commit 7b66fe5999039c53ffbe5a5ffe07c13a5c213455
Author: ...
Date:   Mon Sep 1 17:20:39 2014 +0200

    initial commit

diff --git a/a b/a
new file mode 100644
index 0000000..7898192
--- /dev/null
+++ b/a
@@ -0,0 +1 @@
+a
$ git show b d --
commit ee884fea5d0266280845348175ac0af5083a9bbf
Author: ...
Date:   Mon Sep 1 17:21:05 2014 +0200

    commit b

diff --git a/a b/a
index 7898192..422c2b7 100644
--- a/a
+++ b/a
@@ -1 +1,2 @@
 a
+b
diff --git a/b b/b
new file mode 100644
index 0000000..6178079
--- /dev/null
+++ b/b
@@ -0,0 +1 @@
+b

commit 08adc8512e63588e6f01533b2a0f762342521b05
Author: ...
Date:   Mon Sep 1 17:22:06 2014 +0200

    commit d

diff --git a/a b/a
index de98044..d68dd40 100644
--- a/a
+++ b/a
@@ -1,3 +1,4 @@
 a
 b
 c
+d
diff --git a/b b/b
index 9ddeb5c..4bcfe98 100644
--- a/b
+++ b/b
@@ -1,2 +1 @@
-b
-c
+d
$ git diff b d --
diff --git a/a b/a
index 422c2b7..d68dd40 100644
--- a/a
+++ b/a
@@ -1,2 +1,4 @@
 a
 b
+c
+d
diff --git a/b b/b
index 6178079..4bcfe98 100644
--- a/b
+++ b/b
@@ -1 +1 @@
-b
+d
diff --git a/c b/c
new file mode 100644
index 0000000..f2ad6c7
--- /dev/null
+++ b/c
@@ -0,0 +1 @@
+c
$ git log -p d b --
commit 08adc8512e63588e6f01533b2a0f762342521b05
Author: ...
Date:   Mon Sep 1 17:22:06 2014 +0200

    commit d

diff --git a/a b/a
index de98044..d68dd40 100644
--- a/a
+++ b/a
@@ -1,3 +1,4 @@
 a
 b
 c
+d
diff --git a/b b/b
index 9ddeb5c..4bcfe98 100644
--- a/b
+++ b/b
@@ -1,2 +1 @@
-b
-c
+d

commit 8abaaff681be0bcaa16c946feb2989959348c9f4
Author: ...
Date:   Mon Sep 1 17:21:40 2014 +0200

    commit c

diff --git a/a b/a
index 422c2b7..de98044 100644
--- a/a
+++ b/a
@@ -1,2 +1,3 @@
 a
 b
+c
diff --git a/b b/b
index 6178079..9ddeb5c 100644
--- a/b
+++ b/b
@@ -1 +1,2 @@
 b
+c
diff --git a/c b/c
new file mode 100644
index 0000000..f2ad6c7
--- /dev/null
+++ b/c
@@ -0,0 +1 @@
+c

commit ee884fea5d0266280845348175ac0af5083a9bbf
Author: ...
Date:   Mon Sep 1 17:21:05 2014 +0200

    commit b

diff --git a/a b/a
index 7898192..422c2b7 100644
--- a/a
+++ b/a
@@ -1 +1,2 @@
 a
+b
diff --git a/b b/b
new file mode 100644
index 0000000..6178079
--- /dev/null
+++ b/b
@@ -0,0 +1 @@
+b

commit 7b66fe5999039c53ffbe5a5ffe07c13a5c213455
Author: ...
Date:   Mon Sep 1 17:20:39 2014 +0200

    initial commit

diff --git a/a b/a
new file mode 100644
index 0000000..7898192
--- /dev/null
+++ b/a
@@ -0,0 +1 @@
+a
$ git show d b --
commit 08adc8512e63588e6f01533b2a0f762342521b05
Author: ...
Date:   Mon Sep 1 17:22:06 2014 +0200

    commit d

diff --git a/a b/a
index de98044..d68dd40 100644
--- a/a
+++ b/a
@@ -1,3 +1,4 @@
 a
 b
 c
+d
diff --git a/b b/b
index 9ddeb5c..4bcfe98 100644
--- a/b
+++ b/b
@@ -1,2 +1 @@
-b
-c
+d

commit ee884fea5d0266280845348175ac0af5083a9bbf
Author: ...
Date:   Mon Sep 1 17:21:05 2014 +0200

    commit b

diff --git a/a b/a
index 7898192..422c2b7 100644
--- a/a
+++ b/a
@@ -1 +1,2 @@
 a
+b
diff --git a/b b/b
new file mode 100644
index 0000000..6178079
--- /dev/null
+++ b/b
@@ -0,0 +1 @@
+b
$ git diff d b --
diff --git a/a b/a
index d68dd40..422c2b7 100644
--- a/a
+++ b/a
@@ -1,4 +1,2 @@
 a
 b
-c
-d
diff --git a/b b/b
index 4bcfe98..6178079 100644
--- a/b
+++ b/b
@@ -1 +1 @@
-d
+b
diff --git a/c b/c
deleted file mode 100644
index f2ad6c7..0000000
--- a/c
+++ /dev/null
@@ -1 +0,0 @@
-c
$ git log -p b..d --
commit 08adc8512e63588e6f01533b2a0f762342521b05
Author: ...
Date:   Mon Sep 1 17:22:06 2014 +0200

    commit d

diff --git a/a b/a
index de98044..d68dd40 100644
--- a/a
+++ b/a
@@ -1,3 +1,4 @@
 a
 b
 c
+d
diff --git a/b b/b
index 9ddeb5c..4bcfe98 100644
--- a/b
+++ b/b
@@ -1,2 +1 @@
-b
-c
+d

commit 8abaaff681be0bcaa16c946feb2989959348c9f4
Author: ...
Date:   Mon Sep 1 17:21:40 2014 +0200

    commit c

diff --git a/a b/a
index 422c2b7..de98044 100644
--- a/a
+++ b/a
@@ -1,2 +1,3 @@
 a
 b
+c
diff --git a/b b/b
index 6178079..9ddeb5c 100644
--- a/b
+++ b/b
@@ -1 +1,2 @@
 b
+c
diff --git a/c b/c
new file mode 100644
index 0000000..f2ad6c7
--- /dev/null
+++ b/c
@@ -0,0 +1 @@
+c
$ git show b..d --
commit 08adc8512e63588e6f01533b2a0f762342521b05
Author: ...
Date:   Mon Sep 1 17:22:06 2014 +0200

    commit d

diff --git a/a b/a
index de98044..d68dd40 100644
--- a/a
+++ b/a
@@ -1,3 +1,4 @@
 a
 b
 c
+d
diff --git a/b b/b
index 9ddeb5c..4bcfe98 100644
--- a/b
+++ b/b
@@ -1,2 +1 @@
-b
-c
+d

commit 8abaaff681be0bcaa16c946feb2989959348c9f4
Author: ...
Date:   Mon Sep 1 17:21:40 2014 +0200

    commit c

diff --git a/a b/a
index 422c2b7..de98044 100644
--- a/a
+++ b/a
@@ -1,2 +1,3 @@
 a
 b
+c
diff --git a/b b/b
index 6178079..9ddeb5c 100644
--- a/b
+++ b/b
@@ -1 +1,2 @@
 b
+c
diff --git a/c b/c
new file mode 100644
index 0000000..f2ad6c7
--- /dev/null
+++ b/c
@@ -0,0 +1 @@
+c
$ git diff b..d --
diff --git a/a b/a
index 422c2b7..d68dd40 100644
--- a/a
+++ b/a
@@ -1,2 +1,4 @@
 a
 b
+c
+d
diff --git a/b b/b
index 6178079..4bcfe98 100644
--- a/b
+++ b/b
@@ -1 +1 @@
-b
+d
diff --git a/c b/c
new file mode 100644
index 0000000..f2ad6c7
--- /dev/null
+++ b/c
@@ -0,0 +1 @@
+c
$ git log -p d..b --
$ git show d..b --
$ git diff d..b --
diff --git a/a b/a
index d68dd40..422c2b7 100644
--- a/a
+++ b/a
@@ -1,4 +1,2 @@
 a
 b
-c
-d
diff --git a/b b/b
index 4bcfe98..6178079 100644
--- a/b
+++ b/b
@@ -1 +1 @@
-d
+b
diff --git a/c b/c
deleted file mode 100644
index f2ad6c7..0000000
--- a/c
+++ /dev/null
@@ -1 +0,0 @@
-c
$ git log -p b...d --
commit 08adc8512e63588e6f01533b2a0f762342521b05
Author: ...
Date:   Mon Sep 1 17:22:06 2014 +0200

    commit d

diff --git a/a b/a
index de98044..d68dd40 100644
--- a/a
+++ b/a
@@ -1,3 +1,4 @@
 a
 b
 c
+d
diff --git a/b b/b
index 9ddeb5c..4bcfe98 100644
--- a/b
+++ b/b
@@ -1,2 +1 @@
-b
-c
+d

commit 8abaaff681be0bcaa16c946feb2989959348c9f4
Author: ...
Date:   Mon Sep 1 17:21:40 2014 +0200

    commit c

diff --git a/a b/a
index 422c2b7..de98044 100644
--- a/a
+++ b/a
@@ -1,2 +1,3 @@
 a
 b
+c
diff --git a/b b/b
index 6178079..9ddeb5c 100644
--- a/b
+++ b/b
@@ -1 +1,2 @@
 b
+c
diff --git a/c b/c
new file mode 100644
index 0000000..f2ad6c7
--- /dev/null
+++ b/c
@@ -0,0 +1 @@
+c
$ git show b...d --
commit 08adc8512e63588e6f01533b2a0f762342521b05
Author: ...
Date:   Mon Sep 1 17:22:06 2014 +0200

    commit d

diff --git a/a b/a
index de98044..d68dd40 100644
--- a/a
+++ b/a
@@ -1,3 +1,4 @@
 a
 b
 c
+d
diff --git a/b b/b
index 9ddeb5c..4bcfe98 100644
--- a/b
+++ b/b
@@ -1,2 +1 @@
-b
-c
+d

commit 8abaaff681be0bcaa16c946feb2989959348c9f4
Author: ...
Date:   Mon Sep 1 17:21:40 2014 +0200

    commit c

diff --git a/a b/a
index 422c2b7..de98044 100644
--- a/a
+++ b/a
@@ -1,2 +1,3 @@
 a
 b
+c
diff --git a/b b/b
index 6178079..9ddeb5c 100644
--- a/b
+++ b/b
@@ -1 +1,2 @@
 b
+c
diff --git a/c b/c
new file mode 100644
index 0000000..f2ad6c7
--- /dev/null
+++ b/c
@@ -0,0 +1 @@
+c
$ git diff b...d --
diff --git a/a b/a
index 422c2b7..d68dd40 100644
--- a/a
+++ b/a
@@ -1,2 +1,4 @@
 a
 b
+c
+d
diff --git a/b b/b
index 6178079..4bcfe98 100644
--- a/b
+++ b/b
@@ -1 +1 @@
-b
+d
diff --git a/c b/c
new file mode 100644
index 0000000..f2ad6c7
--- /dev/null
+++ b/c
@@ -0,0 +1 @@
+c
$ git log -p d...b --
commit 08adc8512e63588e6f01533b2a0f762342521b05
Author: ...
Date:   Mon Sep 1 17:22:06 2014 +0200

    commit d

diff --git a/a b/a
index de98044..d68dd40 100644
--- a/a
+++ b/a
@@ -1,3 +1,4 @@
 a
 b
 c
+d
diff --git a/b b/b
index 9ddeb5c..4bcfe98 100644
--- a/b
+++ b/b
@@ -1,2 +1 @@
-b
-c
+d

commit 8abaaff681be0bcaa16c946feb2989959348c9f4
Author: ...
Date:   Mon Sep 1 17:21:40 2014 +0200

    commit c

diff --git a/a b/a
index 422c2b7..de98044 100644
--- a/a
+++ b/a
@@ -1,2 +1,3 @@
 a
 b
+c
diff --git a/b b/b
index 6178079..9ddeb5c 100644
--- a/b
+++ b/b
@@ -1 +1,2 @@
 b
+c
diff --git a/c b/c
new file mode 100644
index 0000000..f2ad6c7
--- /dev/null
+++ b/c
@@ -0,0 +1 @@
+c
$ git show d...b --
commit 08adc8512e63588e6f01533b2a0f762342521b05
Author: ...
Date:   Mon Sep 1 17:22:06 2014 +0200

    commit d

diff --git a/a b/a
index de98044..d68dd40 100644
--- a/a
+++ b/a
@@ -1,3 +1,4 @@
 a
 b
 c
+d
diff --git a/b b/b
index 9ddeb5c..4bcfe98 100644
--- a/b
+++ b/b
@@ -1,2 +1 @@
-b
-c
+d

commit 8abaaff681be0bcaa16c946feb2989959348c9f4
Author: ...
Date:   Mon Sep 1 17:21:40 2014 +0200

    commit c

diff --git a/a b/a
index 422c2b7..de98044 100644
--- a/a
+++ b/a
@@ -1,2 +1,3 @@
 a
 b
+c
diff --git a/b b/b
index 6178079..9ddeb5c 100644
--- a/b
+++ b/b
@@ -1 +1,2 @@
 b
+c
diff --git a/c b/c
new file mode 100644
index 0000000..f2ad6c7
--- /dev/null
+++ b/c
@@ -0,0 +1 @@
+c
$ git diff d...b --
$ 

这篇关于git log -p vs. git show vs. git diff的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！