What is the difference between git merge and git rebase?

Merge creates a merge commit preserving full history. Rebase replays commits on top of the target branch for a linear history. Use merge for shared branches and rebase for local feature branches.

How do I undo the last commit?

Use git reset --soft HEAD~1 to undo the commit but keep changes staged. Use git reset HEAD~1 to unstage changes too. Never reset shared branches.

Git Cheatsheet

Free online Git command cheat sheet reference

Setup

git initInitialize a new repository

git clone <url>Clone a remote repository

git config --global user.name "<name>"Set global username

git config --global user.email "<email>"Set global email

Basic

git statusShow working tree status

git add <file>Stage changes

git add .Stage all changes

git commit -m "<msg>"Commit staged changes

git diffShow unstaged changes

git diff --stagedShow staged changes

Branching

git branchList branches

git branch <name>Create branch

git checkout <branch>Switch branch

git checkout -b <name>Create & switch branch

git merge <branch>Merge branch into current

git branch -d <name>Delete branch

Remote

git remote -vList remotes

git remote add origin <url>Add remote

git push origin <branch>Push to remote

git pull origin <branch>Pull from remote

git fetchFetch without merge

Undo

git reset HEAD <file>Unstage file

git checkout -- <file>Discard changes in file

git reset --soft HEAD~1Undo last commit (keep changes)

git reset --hard HEAD~1Undo last commit (discard)

git stashStash changes

git stash popApply stashed changes

Log

git log --onelineCompact log

git log --graph --onelineGraph log

git show <commit>Show commit details

git blame <file>Show line-by-line author

More Tools

Data URI Generator XML Escape/Unescape ASCII Table Code Snippets Case Converter Password Strength Checker HTML/UBB Converter Text Diff

Git Cheatsheet

Git Commands Quick Reference

More Tools