跳到主要内容

Git丢弃工作区更改指南

场景说明​

当你在Git仓库中进行了一些修改，但还没有执行 git add，想要丢弃这些修改时使用。

快速参考​

现代推荐方法 (Git 2.23+)​

git restore .                    # 恢复所有未暂存的修改
git restore <文件名>             # 恢复特定文件的修改
git restore file1.txt file2.txt # 恢复多个文件的修改

传统方法（兼容性好）​

git checkout .                   # 恢复所有未暂存的修改
git checkout -- <文件名>         # 恢复特定文件的修改
git checkout -- file1.txt file2.txt # 恢复多个文件的修改
git checkout  <文件名>         # 这样写也对但是可能会有歧义

操作前的检查命令​

git status                       # 查看修改的文件列表
git diff                         # 查看具体的修改内容
git diff <文件名>                # 查看特定文件的修改内容

详细命令对比​

git restore 系列（推荐使用）​

命令功能示例
git restore .恢复当前目录及子目录的所有文件git restore .
git restore <文件>恢复单个文件git restore index.html
git restore <多个文件>恢复多个指定文件git restore app.js style.css

git checkout 系列（传统方法）​

命令功能示例说明
git checkout .恢复当前目录及子目录的所有文件git checkout .无歧义
git checkout -- <文件>恢复单个文件（推荐写法）git checkout -- index.html明确指定为文件操作
git checkout <文件>恢复单个文件（有歧义风险）git checkout index.html⚠️ 可能与分支名冲突

两种方法的区别​

方面git checkoutgit restore
引入版本Git早期版本就有Git 2.23+ (2019年)
语义明确性功能过载（切换分支+恢复文件）专门用于恢复文件
语法复杂度需要 -- 避免歧义不需要 --
歧义问题文件名与分支名可能冲突无歧义问题
未来发展逐渐被替代Git官方推荐

-- 分隔符的作用​

在 git checkout 中，-- 是一个重要的分隔符：

git checkout main              # 切换到main分支
git checkout main.txt          # 有歧义：可能是切换分支，也可能是恢复文件
git checkout -- main.txt       # 明确指定：恢复名为main.txt的文件

三种写法对比：

git checkout mybranch          # 切换到mybranch分支
git checkout mybranch.js       # 有歧义！如果存在mybranch分支会优先切换分支
git checkout -- mybranch.js    # 明确恢复mybranch.js文件

-- 的作用：

  • 明确告诉Git后面的参数是文件路径而不是分支名
  • 防止文件名和分支名冲突导致的歧义
  • 确保命令执行的是恢复文件操作

实际使用示例​

场景1：恢复所有修改​

# 查看当前状态
git status

# 查看具体修改（可选）
git diff

# 恢复所有修改（二选一）
git restore .
# 或
git checkout .

场景2：恢复特定文件​

# 查看特定文件的修改
git diff app.js

# 恢复该文件（三选一）
git restore app.js             # 推荐：现代方法，无歧义
# 或
git checkout -- app.js         # 推荐：传统方法，明确语义
# 或  
git checkout app.js            # 不推荐：有歧义风险

场景3：恢复多个文件​

# 恢复多个指定文件（三选一）
git restore app.js style.css index.html                    # 推荐：现代方法
# 或
git checkout -- app.js style.css index.html               # 推荐：传统方法，明确语义
# 或
git checkout app.js style.css index.html                  # 不推荐：有歧义风险

⚠️ 重要注意事项​

  1. 不可恢复性：这些操作会永久删除你的修改，无法撤销
  2. 影响范围：只影响工作目录中的文件，不会影响已提交的内容
  3. 操作前确认：建议先用 git diff 查看要丢弃的修改
  4. 版本兼容性：git restore 需要 Git 2.23 或更高版本
  5. 歧义风险：使用 git checkout <文件名> 时，如果文件名与分支名相同，Git会优先执行分支切换操作
  6. 最佳实践：推荐使用 git restore 或 git checkout -- 来避免歧义

推荐使用策略​

新项目或个人使用​

git restore .        # 简洁明了，语义清晰
git restore <文件名>  # 无歧义风险

团队合作或老项目​

git checkout .           # 兼容性好
git checkout -- <文件名> # 明确语义，避免歧义

相关命令补充​

# 查看修改状态
git status -s                    # 简化状态显示
git diff --name-only             # 只显示修改的文件名
git diff --stat                  # 显示修改统计信息

# 交互式恢复（部分恢复）
git checkout -p <文件名>         # 交互式选择要恢复的部分
git restore -p <文件名>          # 同上，使用新命令

最后提醒：在执行任何恢复操作前，请务必确认要丢弃的修改，因为这些操作不可撤销！

Git Working Directory Changes Discard Guide​

Scenario​

When you have made some changes in your Git repository but haven't executed git add yet, and you want to discard these changes.

Quick Reference​

git restore .                    # Restore all unstaged changes
git restore <filename>           # Restore specific file changes
git restore file1.txt file2.txt # Restore multiple file changes

Traditional Method (Better Compatibility)​

git checkout .                   # Restore all unstaged changes
git checkout -- <filename>      # Restore specific file changes
git checkout -- file1.txt file2.txt # Restore multiple file changes

Pre-operation Check Commands​

git status                       # View list of modified files
git diff                         # View specific modification content
git diff <filename>              # View modifications of specific file

Detailed Command Comparison​

CommandFunctionExample
git restore .Restore all files in current directory and subdirectoriesgit restore .
git restore <file>Restore single filegit restore index.html
git restore <multiple files>Restore multiple specified filesgit restore app.js style.css

git checkout Series (Traditional Method)​

CommandFunctionExampleNotes
git checkout .Restore all files in current directory and subdirectoriesgit checkout .No ambiguity
git checkout -- <file>Restore single file (recommended syntax)git checkout -- index.htmlExplicitly specifies file operation
git checkout <file>Restore single file (ambiguity risk)git checkout index.html⚠️ May conflict with branch names

Differences Between Both Methods​

Aspectgit checkoutgit restore
Introduced VersionEarly Git versionsGit 2.23+ (2019)
Semantic ClarityFunction overloading (switch branch + restore file)Dedicated for file restoration
Syntax ComplexityRequires -- to avoid ambiguityNo need for --
Ambiguity IssuesFilenames may conflict with branch namesNo ambiguity issues
Future DevelopmentGradually being replacedOfficially recommended by Git

Purpose of -- Separator​

In git checkout, -- is an important separator:

git checkout main              # Switch to main branch
git checkout main.txt          # Ambiguous: could switch branch or restore file
git checkout -- main.txt       # Explicitly specified: restore main.txt file

Comparison of Three Syntaxes:

git checkout mybranch          # Switch to mybranch branch
git checkout mybranch.js       # Ambiguous! Will prioritize branch switch if mybranch branch exists
git checkout -- mybranch.js    # Explicitly restore mybranch.js file

Purpose of --:

  • Explicitly tells Git that following parameters are file paths, not branch names
  • Prevents ambiguity caused by filename and branch name conflicts
  • Ensures the command performs file restoration operation

Practical Usage Examples​

Scenario 1: Restore All Changes​

# Check current status
git status

# View specific changes (optional)
git diff

# Restore all changes (choose one)
git restore .
# or
git checkout .

Scenario 2: Restore Specific File​

# View modifications of specific file
git diff app.js

# Restore the file (choose one of three)
git restore app.js             # Recommended: modern method, no ambiguity
# or
git checkout -- app.js         # Recommended: traditional method, clear semantics
# or  
git checkout app.js            # Not recommended: ambiguity risk

Scenario 3: Restore Multiple Files​

# Restore multiple specified files (choose one of three)
git restore app.js style.css index.html                    # Recommended: modern method
# or
git checkout -- app.js style.css index.html               # Recommended: traditional method, clear semantics
# or
git checkout app.js style.css index.html                  # Not recommended: ambiguity risk

⚠️ Important Notes​

  1. Irreversibility: These operations will permanently delete your changes and cannot be undone
  2. Scope of Impact: Only affects files in the working directory, won't affect committed content
  3. Pre-operation Confirmation: Recommend using git diff to review changes to be discarded
  4. Version Compatibility: git restore requires Git 2.23 or higher
  5. Ambiguity Risk: When using git checkout <filename>, if the filename matches a branch name, Git will prioritize branch switching operation
  6. Best Practice: Recommend using git restore or git checkout -- to avoid ambiguity

New Projects or Personal Use​

git restore .        # Clean and clear, semantic clarity
git restore <filename>  # No ambiguity risk

Team Collaboration or Legacy Projects​

git checkout .           # Good compatibility
git checkout -- <filename> # Clear semantics, avoid ambiguity
# View modification status
git status -s                    # Simplified status display
git diff --name-only             # Show only modified filenames
git diff --stat                  # Show modification statistics

# Interactive restoration (partial restoration)
git checkout -p <filename>       # Interactively select parts to restore
git restore -p <filename>        # Same as above, using new command

Final Reminder: Before executing any restoration operation, please make sure to confirm the changes you want to discard, as these operations are irreversible!