Git Cheat Sheet

See what's going on

• Status Changed files and your branch, in short form.Copy git status -sb
• What changed Edits you haven't staged yet.Copy git diff
• Staged changes Exactly what the next commit will contain.Copy git diff --staged
• History The last 20 commits as a compact graph.Copy git log --oneline --graph -20
• Show a commit The message and full diff of one commit.Fill in git show {{commit}}
• Who wrote this The author and commit behind every line of a file.Fill in git blame {{file}}

Stage and commit

Amending rewrites the last commit. That's fine before you push; after a push it needs a force push.

• Stage a file Put one file into the next commit.Fill in git add {{file}}
• Stage everything All changes, including new and deleted files.Copy git add -A
• Commit Save the staged changes with a message.Fill in git commit -m "{{message}}"
• Fix last commit Add the staged changes to the previous commit and keep its message.Copy git commit --amend --no-edit
• Unstage Take a file out of the next commit. Your edits stay.Fill in git restore --staged {{file}}
• Discard edits Put a file back to the last commit. The edits are gone for good.Fill in git restore {{file}}

Branches

• List branches Local branches, what they track, and how far ahead or behind they are.Copy git branch -vv
• New branch Create a branch and move to it.Fill in git switch -c {{branch}}
• Switch branch Move to an existing branch.Fill in git switch {{branch}}
• Rename branch Rename the branch you are on.Fill in git branch -m {{new_name}}
• Delete branch Delete a merged local branch. -D deletes it even if unmerged.Fill in git branch -d {{branch}}
• Delete on remote Remove the branch from the remote.Fill in git push origin --delete {{branch}}

Work with a remote

--force-with-lease refuses to overwrite commits you haven't fetched, which plain --force happily does.

• Clone Download a repository into a new folder.Fill in git clone {{url}}
• Fetch Download new commits and forget deleted remote branches. Touches none of your files.Copy git fetch --prune
• Pull Fetch, then replay your local commits on top. No merge bubbles.Copy git pull --rebase
• Push Upload your commits.Copy git push
• Push new branch First push of a branch. Sets tracking, so plain git push works afterwards.Copy git push -u origin HEAD
• Force push, safely Overwrite the remote branch only if nobody pushed since your last fetch.Copy git push --force-with-lease

Merge and rebase

• Merge Bring another branch into the one you are on.Fill in git merge {{branch}}
• Rebase Replay your commits on top of another branch.Fill in git rebase {{branch}}
• Edit commits Reorder, squash or reword the last n commits.Fill in git rebase -i HEAD~{{n}}
• Continue rebase Carry on after you resolved conflicts and staged the files.Copy git rebase --continue
• Abort rebase Give up and return to where you started.Copy git rebase --abort
• Cherry-pick Copy one commit onto the current branch.Fill in git cherry-pick {{commit}}

Undo and rescue

restore and reset --hard destroy uncommitted work and Git cannot bring it back. Committed work is safer: git reflog still lists it for at least 30 days.

• Stash Shelve all uncommitted work, new files included.Copy git stash -u
• Unstash Bring the most recent stash back.Copy git stash pop
• Undo last commit Remove the commit but keep its changes staged.Copy git reset --soft HEAD~1
• Revert a commit Make a new commit that undoes an old one. Safe for history you already pushed.Fill in git revert {{commit}}
• Discard everything Throw away all uncommitted changes to tracked files.Copy git reset --hard HEAD
• Find lost commits Everywhere HEAD has been. This is how you get a commit back after a bad reset.Copy git reflog