diff --git a/tools/git.txt b/tools/git.txt index 386b44f..7fd4160 100644 --- a/tools/git.txt +++ b/tools/git.txt @@ -35,11 +35,11 @@ git commit --amend --author "user_name " 修改最近提交用户名 git status git status -s 文件状态缩略信息, 常见 A:新增; M:文件变更; ?:未track; D:删除 git diff -git diff HEAD -- 查看工作区和版本库里面最新版本的区别 -git diff --check 检查是否有空白错误(regex:' \{1,\}$') -git diff --cached 查看已add的内容(绿M) -git diff branch1 branch2 --stat 查看两个分支差异 -git diff branch1 branch2 查看分支文件具体差异 +git diff HEAD -- 查看工作区和版本库里面最新版本的区别 +git diff --check 检查是否有空白错误(regex:' \{1,\}$') +git diff --cached 查看已add的内容(绿M) +git diff branch1 branch2 --stat 查看两个分支差异 +git diff branch1 branch2 查看分支文件具体差异 ############################################################################## # 查看历史版本、历史操作