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 +# 回退到某个版本,并丢弃工作区与暂存区的所有修改内容 +git reset --hard +# 回退到某个版本,只保留工作区的内容 +git reset --mixed +``` +## 查看差异 +```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