From e53035d50f611778868c2b3355972f591903f781 Mon Sep 17 00:00:00 2001
From: iProbe <iprobe@noreply.localhost>
Date: Tue, 23 May 2023 17:15:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'Git/git=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?.md'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Git/git基础.md | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/Git/git基础.md b/Git/git基础.md
index 3a92304..a0c7723 100644
--- a/Git/git基础.md
+++ b/Git/git基础.md
@@ -13,4 +13,35 @@ git config --global --i
 ```shell
 git init
 ```
-## 
\ No newline at end of file
+## 查看提交日志
+```shell
+git log
+git log --oneline
+```
+## 查看暂存区
+```shell
+git ls-files
+```
+## 回退
+```shell
+# 回退到某个版本，并保留工作区与暂存区的所有修改内容
+git reset --soft <version>
+# 回退到某个版本，并丢弃工作区与暂存区的所有修改内容
+git reset --hard <version>
+# 回退到某个版本，只保留工作区的内容
+git reset --mixed <version>
+```
+## 查看差异
+```shell
+# 默认比较工作区与暂存区的差异
+git diff
+# 工作区与版本库的差异
+git diff HEAD
+# 暂存区与版本库差异
+git diff cached
+# 两次提交的差异
+git diff xxx xxxx1
+# 之前两个版本的差异
+git diff HEAD~ HEAD
+git diff HEAD^ HEAD
+```
\ No newline at end of file