From 0d3e02eb41fff33468e7c6f5be2828493f0494a5 Mon Sep 17 00:00:00 2001
From: lxsz <hshizhao@qq.com>
Date: Tue, 25 Aug 2020 15:34:47 +0800
Subject: [PATCH] Update git.txt

---
 tools/git.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/git.txt b/tools/git.txt
index 431d280..20d5c5e 100644
--- a/tools/git.txt
+++ b/tools/git.txt
@@ -35,8 +35,10 @@ git status
 git status -s 文件状态缩略信息, 常见 A:新增; M:文件变更; ?:未track; D:删除
 git diff <file>
 git diff HEAD -- <file>		查看工作区和版本库里面最新版本的区别
-git diff --check <file>     检查是否有空白错误(regex:' \{1,\}$')
-git diff --cached <file>    查看已add的内容(绿M)
+git diff --check <file>     	检查是否有空白错误(regex:' \{1,\}$')
+git diff --cached <file>    	查看已add的内容(绿M)
+git diff branch1 branch2 --stat	查看两个分支差异
+git diff branch1 branch2 <file...> 查看分支文件具体差异
 
 ##############################################################################
 # 查看历史版本、历史操作