Git cheat sheet

Git commands for everyday work and emergencies – searchable and copyable in one click. With warnings on commands that discard work for good.

37 commands

Everyday: status & commit

Short status with branch and tracking info
git status -sb
Show unstaged changes
git diff
Show staged changes
git diff --staged
Stage changes hunk by hunk
git add -p
Create a commit with a message
git commit -m "Fix login redirect"
Add staged changes to the last commit
git commit --amend --no-edit
⚠ Careful: changes or deletes data
Create and switch to a new branch
git switch -c feature/login

Last 20 commits as a compact graph
git log --oneline --graph --decorate -20
One author's commits from the last 2 weeks
git log --since='2 weeks ago' --author='Daniele'
Find commits that added or removed a string
git log -S 'password' --oneline
Who last changed lines 10-30?
git blame -L 10,30 file.py

Replay the current branch onto main
git rebase main
Interactively reorder, squash or reword the last 4 commits
git rebase -i HEAD~4
⚠ Careful: changes or deletes data
Abort the rebase, back to the previous state
git rebase --abort
Merge a branch with a merge commit
git merge --no-ff feature/login

Discard unstaged changes of a file
git restore file.txt
⚠ Careful: changes or deletes data
Unstage a file, keep the changes
git restore --staged file.txt
Undo a commit with a new inverse commit (safe on shared branches)
git revert abc1234
Undo the last commit, keep changes staged
git reset --soft HEAD~1
Throw away the last commit and its changes
git reset --hard HEAD~1
⚠ Careful: changes or deletes data
Permanently delete untracked files and folders
git clean -fd
⚠ Careful: changes or deletes data

Show the history of all HEAD movements
git reflog
Reset to an earlier reflog state
git reset --hard HEAD@{2}
⚠ Careful: changes or deletes data
Rescue a lost commit by hash as a branch
git switch -c rescue abc1234
Find dangling objects
git fsck --lost-found
Undo the last reset, merge or rebase
git reset --hard ORIG_HEAD
⚠ Careful: changes or deletes data

Fetch all remotes, prune deleted branches
git fetch --all --prune
Fetch and replay local commits on top
git pull --rebase
Force push that won't overwrite others' new commits
git push --force-with-lease
⚠ Careful: changes or deletes data
Start a binary search for the breaking commit
git bisect start && git bisect bad && git bisect good v1.2
Run bisect automatically with a test script
git bisect run ./test.sh
End bisect, return to the original branch
git bisect reset