Git Reset, Revert, and Restore Cheat Sheet

git reset --soft HEAD~1

# Move HEAD back one commit while preserving index and working tree.

git reset --mixed HEAD~1

# Move HEAD back one commit and leave changes in the working tree.

git reset --hard HEAD~1

# Move HEAD back one commit and discard index and working tree changes.

git reset HEAD path/to/file

# Remove a path from the index without changing its contents in the working tree.

git reset --merge ORIG_HEAD

# Try to leave local changes intact while backing out of a merge-like operation.

git revert <commit_sha>

# Create a new commit that reverses an earlier commit.

git revert --no-commit <start_commit>^..<end_commit>

# Apply inverse changes into the index and working tree first.

git revert -m 1 <merge_commit_sha>

# Reverse a merge relative to a chosen parent.

git revert --continue

# Resume revert after resolving conflicts.

git restore path/to/file

# Restore a file in the working tree from the index.

git restore --staged path/to/file

# Restore the index entry for a path from HEAD.

git restore --source=<commit_sha> path/to/file

# Copy file contents from a specific commit into the working tree.

git restore --patch path/to/file

# Select portions of a file to restore interactively.

git restore --source=<commit_sha> --staged --worktree path/to/file

# Reset a file to another revision in both staging area and working tree.

reset = move branch/history
restore = restore file content/index state
revert = add new commit that undoes old commit

# Quick decision guide for the three similarly named commands.

git branch backup-before-reset

# Save a recovery pointer before hard reset or risky history edits.

git reflog

# Find the previous branch tip after a bad reset.