Undo the last commit, keep the changes
Removes the last commit but leaves its changes staged, ready to edit and commit again.
git reset --soft HEAD~1If the commit was already pushed, use git revert instead so you don’t rewrite shared history.
Git commands cheat sheet
The Git commands people actually search for: undoing commits, fixing branches, stashing, rewriting messages and recovering lost work. Fill in the blanks and copy.
37 commands
Safely undo a pushed commit
Creates a new commit that reverses an earlier one. Safe on shared branches because history isn’t rewritten.
git revert Fix the last commit message
Replaces the message of the most recent commit.
git commit --amend -m ""Rewrites the commit. If it was already pushed you’ll need git push --force-with-lease.
Add a forgotten file to the last commit
Stages the file and folds it into the previous commit without changing its message.
git add && git commit --amend --no-editRewrites the last commit; avoid on commits others have pulled.
Short status with branch info
A compact view of changed files plus how far ahead or behind your branch is.
git status -sbStage everything and commit
Stages new, changed and deleted files, then commits them in one go.
git add -A && git commit -m ""Create and switch to a new branch
Creates a branch from where you are and moves onto it.
git switch -c Switch branches
Moves to an existing branch.
git switch Push a new branch and track it
Publishes the current branch with the same name and sets it as the upstream, so plain git push works next time.
git push -u origin HEADPull without a merge commit
Fetches remote changes and replays your local commits on top, keeping history linear.
git pull --rebaseDiscard changes to a file
Throws away uncommitted edits to a file and restores the last committed version.
git restore Uncommitted edits to that file are lost.
Unstage a file
Removes a file from the staging area but keeps your edits.
git restore --staged Make local branch match the remote exactly
Throws away all local commits and changes on this branch and copies the remote version.
git fetch origin && git reset --hard origin/Deletes uncommitted work and unpushed commits. Run git stash first if you might need them.
Stash work in progress
Shelves your uncommitted changes so you can switch branches with a clean tree.
git stash push -m ""Bring back stashed work
Re-applies the most recent stash and removes it from the stash list.
git stash popList stashes
Shows every stash with its message.
git stash listPretty one-line history graph
A compact visual graph of all branches and commits.
git log --oneline --graph --decorate --allSee what you’re about to commit
Shows the exact changes that are staged.
git diff --stagedSee who changed each line
Annotates every line with the commit and author that last changed it.
git blame Find when some code was added or removed
Lists commits that added or removed the given text. Great for "when did this disappear?"
git log -S "" --onelineCopy one commit onto this branch
Applies the changes from a single commit on another branch to your current branch.
git cherry-pick Recover "lost" commits
Shows everywhere HEAD has been, including commits removed by reset or rebase. Use the hash with git reset or git switch -c to get them back.
git reflogPreview deleting untracked files
Lists the untracked files and folders that git clean -fd would delete. Nothing is removed.
git clean -ndDelete untracked files and folders
Removes every untracked file and directory from the working tree.
git clean -fdPermanently deletes untracked files (they’re not in Git, so there’s no undo). Run git clean -nd first to preview.
Delete a local branch
Deletes a branch that has been merged. Use -D to force-delete an unmerged one.
git branch -d Delete a remote branch
Removes the branch from the remote repository.
git push origin --delete Rename the current branch
Renames the branch you’re on.
git branch -m Delete all merged local branches
Cleans up local branches that are already merged into the base branch.
git branch --merged | grep -v '^[ *]*$' | xargs git branch -dForce-push safely
Overwrites the remote branch only if nobody else has pushed since you last fetched.
git push --force-with-leaseStill rewrites remote history; only use on branches you own.
Squash the last few commits into one
Combines your last N commits into a single commit.
git reset --soft HEAD~ && git commit -m ""Rewrites history; avoid on commits that are already shared.
Tag and push a release
Creates an annotated version tag and publishes it.
git tag -a v -m "Release v" && git push origin vSet your name and email
Sets the author identity used on every commit on this computer.
git config --global user.name "" && git config --global user.email ""Use "main" for new repositories
Makes git init create a main branch instead of master.
git config --global init.defaultBranch mainChange the remote URL
Points origin at a new address, for example when switching from HTTPS to SSH.
git remote set-url origin Clone just the latest snapshot
Downloads only the most recent commit. Much faster for big repositories.
git clone --depth 1 Commits per author
Ranks contributors by number of commits.
git shortlog -sn --allStop tracking a file but keep it
Removes the file from Git (for example after adding it to .gitignore) without deleting it from disk.
git rm --cached Every command copies as plain, clean text: no curly quotes, no long dashes, no invisible characters.