How do I undo the last commit?

Use git reset --soft HEAD~1 to keep your changes staged, or git reset --hard HEAD~1 to discard them. Use git revert to undo a pushed commit safely.

What is the difference between merge and rebase?

Merge combines branches and preserves history with a merge commit; rebase replays your commits on top of another branch for a linear history. Avoid rebasing shared branches.

How do I discard local changes?

git checkout -- or git restore discards changes to a file; git clean -fd removes untracked files.

How do I create and switch to a branch?

git switch -c (or git checkout -b ) creates a new branch and switches to it.

How do I see what changed?

git status shows the working tree state, git diff shows unstaged changes, and git log shows commit history.

trysys.jp

Reference

Git Cheat Sheet

Essential Git commands for everyday workflows. Click any card to copy.