Git Cheat Sheet

git config --global user.name "Your Name"
git config --global user.email "you@example.com"

git init
git init my-project

git clone https://github.com/user/repo.git
git clone git@github.com:user/repo.git

git config --list
git config user.email

git status
git status -s    # short format

git add file.txt          # single file
git add src/              # directory
git add -A                # everything
git add -p                # interactive hunks

git commit -m "feat: add login page"
git commit -am "fix: typo"   # stage + commit tracked
git commit --amend           # edit last commit

git diff                  # unstaged changes
git diff --staged         # staged changes
git diff main..feature    # between branches

git branch          # local
git branch -r       # remote
git branch -a       # all

git branch feature
git switch feature
git switch -c feature   # create + switch

git branch -d feature          # safe delete
git branch -D feature          # force delete
git push origin --delete feature  # remote

git branch -m old-name new-name

git switch main
git merge feature
git merge --no-ff feature   # always create merge commit

git switch feature
git rebase main
git rebase -i HEAD~3   # interactive rebase last 3

# Edit conflicting files, then:
git add resolved-file.txt
git rebase --continue
# or abort:
git merge --abort
git rebase --abort

git cherry-pick abc1234
git cherry-pick abc1234..def5678

git remote -v
git remote add origin https://github.com/user/repo.git
git remote set-url origin <new-url>

git push origin main
git push -u origin feature   # set upstream
git push --force-with-lease   # safe force push

git pull                     # fetch + merge
git pull --rebase             # fetch + rebase
git fetch origin              # fetch only

git stash                    # stash changes
git stash pop                # apply + remove
git stash apply              # apply, keep stash

git stash list
git stash show -p stash@{0}
git stash drop stash@{0}
git stash clear

git log --oneline
git log --oneline --graph --all
git log -5                   # last 5 commits
git log --author="Alice"

git blame file.txt
git blame -L 10,20 file.txt

git show abc1234
git show HEAD~2:file.txt     # file at that commit

git restore --staged file.txt

git restore file.txt         # discard working tree
git checkout -- file.txt     # older syntax

git reset --soft HEAD~1      # undo commit, keep staged
git reset --mixed HEAD~1     # undo commit + unstage
git reset --hard HEAD~1      # undo everything

git revert abc1234           # create inverse commit

git tag v1.0.0
git tag -a v1.0.0 -m "Release 1.0.0"

git push origin v1.0.0
git push origin --tags

git tag -l "v1.*"
git tag -d v1.0.0
git push origin --delete v1.0.0