git restore Command Guide

# Discard changes in working directory
git restore file.js

# Unstage a file
git restore --staged file.js

# Restore from a specific commit
git restore --source=HEAD~1 file.js

# Discard changes in a single file
git restore file.js

# Discard changes in multiple files
git restore file1.js file2.js

# Discard all changes in working directory
git restore .

# Interactive: choose which changes to discard
git restore -p file.js

# Unstage a file (keep working directory changes)
git restore --staged file.js

# Unstage all files
git restore --staged .

# Unstage specific files
git restore --staged src/app.js src/utils.js

# Interactive unstaging
git restore --staged -p file.js

# Restore from previous commit
git restore --source=HEAD~1 file.js

# Restore from specific commit
git restore --source=abc1234 file.js

# Restore from another branch
git restore --source=main file.js

# Restore entire directory from commit
git restore --source=v1.0.0 src/

# Restore and unstage (both working dir and staging)
git restore --source=HEAD --staged --worktree file.js

# Old way (checkout)
git checkout -- file.js          # Discard changes
git checkout HEAD file.js        # Restore from HEAD
git checkout abc1234 -- file.js  # Restore from commit

# New way (restore) - clearer intent
git restore file.js              # Discard changes
git restore --source=HEAD file.js
git restore --source=abc1234 file.js

# Accidentally modified a file - discard changes
git restore file.js

# Added wrong files to staging
git restore --staged *.log

# Get old version of config file
git restore --source=v1.0.0 config.json

# Undo all changes, start fresh
git restore .
git restore --staged .

# Partially discard changes
git restore -p file.js
# Choose 'y' or 'n' for each hunk

# Restore deleted file
git restore deleted-file.js