Git 查看两个版本的差异和修改了那些文件

Git 查看两个版本的差异和修改了那些文件

具体方法如下，选择一个即可

• 查看两个提交版本id的修改记录差异
  $ git diff commit-id1 commit-id2

$ git diff 0f6e200ef7e25db8b9c60ead50317c7ff5069a74 fb3254853032125e9418cf941a3b68afc664fb61
diff --git a/src/build.sh b/src/build.sh
index 1df2483..aef97f9 100644
--- a/src/build.sh
+++ b/src/build.sh
@@ -1,4 +1,4 @@
-# rm normal_operation/docking/enter_dock/avoid_obstacle_for_dock.o
+rm normal_operation/docking/enter_dock/avoid_obstacle_for_dock.o

• 查看两个提交版本id修改了那些文件，可以使用
  $ git diff commit-id1 commit-id2 --stat

$ git diff d5b61f1c718a4e496a27575842dc58496176a5ee  66a7101bbac4fd21059c703ded2fdb6449e54eb5 --stat
 src/normal_operation/docking/enter_dock/enter_dock.cpp | 103 ++++++++++++++-----------------------------------------------------------------------------------------
 src/normal_operation/docking/enter_dock/enter_dock.h   |   4 +++-
 2 files changed, 17 insertions(+), 90 deletions(-)

• 提交日志显示每个版本的提交主题和具体修改的文件名字
  $ git log --name-only

commit ec5def3d231476bd1be5baf6923015e9d7b1161f
Author: Tony Tech 
Date:   Thu Mar 7 20:54:09 2019 +0800

    fix charging to docking bumper dock rotate moving the dock bug

src/normal_operation/docking/docking/docking.cpp
src/normal_operation/docking/enter_dock/avoid_obstacle_for_dock.cpp