$ -weight: 500;">git --version # -weight: 500;">git version 2.x.x -weight: 500;">git --version # -weight: 500;">git version 2.x.x -weight: 500;">git --version # -weight: 500;">git version 2.x.x -weight: 500;">git config --global user.name "Your Name" -weight: 500;">git config --global user.email "[email protected]" # Set your default editor (VS Code shown here) -weight: 500;">git config --global core.editor "code --wait" # Set default branch name to 'main' -weight: 500;">git config --global init.defaultBranch main # Verify your config -weight: 500;">git config --list -weight: 500;">git config --global user.name "Your Name" -weight: 500;">git config --global user.email "[email protected]" # Set your default editor (VS Code shown here) -weight: 500;">git config --global core.editor "code --wait" # Set default branch name to 'main' -weight: 500;">git config --global init.defaultBranch main # Verify your config -weight: 500;">git config --list -weight: 500;">git config --global user.name "Your Name" -weight: 500;">git config --global user.email "[email protected]" # Set your default editor (VS Code shown here) -weight: 500;">git config --global core.editor "code --wait" # Set default branch name to 'main' -weight: 500;">git config --global init.defaultBranch main # Verify your config -weight: 500;">git config --list mkdir my-project && cd my-project -weight: 500;">git init # Initialized empty Git repository in .-weight: 500;">git/ mkdir my-project && cd my-project -weight: 500;">git init # Initialized empty Git repository in .-weight: 500;">git/ mkdir my-project && cd my-project -weight: 500;">git init # Initialized empty Git repository in .-weight: 500;">git/ -weight: 500;">git clone https://github.com/user/repo.-weight: 500;">git # Clone into a specific folder name -weight: 500;">git clone https://github.com/user/repo.-weight: 500;">git my-folder # Clone only the latest snapshot (faster for large repos) -weight: 500;">git clone --depth 1 https://github.com/user/repo.-weight: 500;">git -weight: 500;">git clone https://github.com/user/repo.-weight: 500;">git # Clone into a specific folder name -weight: 500;">git clone https://github.com/user/repo.-weight: 500;">git my-folder # Clone only the latest snapshot (faster for large repos) -weight: 500;">git clone --depth 1 https://github.com/user/repo.-weight: 500;">git -weight: 500;">git clone https://github.com/user/repo.-weight: 500;">git # Clone into a specific folder name -weight: 500;">git clone https://github.com/user/repo.-weight: 500;">git my-folder # Clone only the latest snapshot (faster for large repos) -weight: 500;">git clone --depth 1 https://github.com/user/repo.-weight: 500;">git Working Tree → Staging Area → Repository (edit) (-weight: 500;">git add) (-weight: 500;">git commit) Working Tree → Staging Area → Repository (edit) (-weight: 500;">git add) (-weight: 500;">git commit) Working Tree → Staging Area → Repository (edit) (-weight: 500;">git add) (-weight: 500;">git commit) -weight: 500;">git -weight: 500;">status # What's changed? What's staged? -weight: 500;">git -weight: 500;">status -s # Short format: M = modified, A = added, ? = untracked -weight: 500;">git -weight: 500;">status # What's changed? What's staged? -weight: 500;">git -weight: 500;">status -s # Short format: M = modified, A = added, ? = untracked -weight: 500;">git -weight: 500;">status # What's changed? What's staged? -weight: 500;">git -weight: 500;">status -s # Short format: M = modified, A = added, ? = untracked -weight: 500;">git add file.js # Stage a specific file -weight: 500;">git add src/ # Stage an entire directory -weight: 500;">git add . # Stage everything in the current directory -weight: 500;">git add -p # Interactive: stage changes chunk by chunk -weight: 500;">git add file.js # Stage a specific file -weight: 500;">git add src/ # Stage an entire directory -weight: 500;">git add . # Stage everything in the current directory -weight: 500;">git add -p # Interactive: stage changes chunk by chunk -weight: 500;">git add file.js # Stage a specific file -weight: 500;">git add src/ # Stage an entire directory -weight: 500;">git add . # Stage everything in the current directory -weight: 500;">git add -p # Interactive: stage changes chunk by chunk -weight: 500;">git commit -m "feat: add user authentication" # Stage all tracked files and commit in one step -weight: 500;">git commit -am "fix: correct typo in error message" # Open your editor for a detailed commit message -weight: 500;">git commit -weight: 500;">git commit -m "feat: add user authentication" # Stage all tracked files and commit in one step -weight: 500;">git commit -am "fix: correct typo in error message" # Open your editor for a detailed commit message -weight: 500;">git commit -weight: 500;">git commit -m "feat: add user authentication" # Stage all tracked files and commit in one step -weight: 500;">git commit -am "fix: correct typo in error message" # Open your editor for a detailed commit message -weight: 500;">git commit <type>(<scope>): <short summary> <optional body> <optional footer> <type>(<scope>): <short summary> <optional body> <optional footer> <type>(<scope>): <short summary> <optional body> <optional footer> # Good -weight: 500;">git commit -m "feat(auth): add JWT refresh token rotation" -weight: 500;">git commit -m "fix(api): handle null response from payment gateway" -weight: 500;">git commit -m "docs: -weight: 500;">update README with Docker setup instructions" # Bad -weight: 500;">git commit -m "stuff" -weight: 500;">git commit -m "fix" -weight: 500;">git commit -m "asdfgh" # Good -weight: 500;">git commit -m "feat(auth): add JWT refresh token rotation" -weight: 500;">git commit -m "fix(api): handle null response from payment gateway" -weight: 500;">git commit -m "docs: -weight: 500;">update README with Docker setup instructions" # Bad -weight: 500;">git commit -m "stuff" -weight: 500;">git commit -m "fix" -weight: 500;">git commit -m "asdfgh" # Good -weight: 500;">git commit -m "feat(auth): add JWT refresh token rotation" -weight: 500;">git commit -m "fix(api): handle null response from payment gateway" -weight: 500;">git commit -m "docs: -weight: 500;">update README with Docker setup instructions" # Bad -weight: 500;">git commit -m "stuff" -weight: 500;">git commit -m "fix" -weight: 500;">git commit -m "asdfgh" -weight: 500;">git log # Full log -weight: 500;">git log --oneline # Compact: one commit per line -weight: 500;">git log --oneline --graph # ASCII branch graph -weight: 500;">git log --oneline --graph --all # Include all branches # Filter by author -weight: 500;">git log --author="Jane" # Filter by date -weight: 500;">git log --since="2 weeks ago" -weight: 500;">git log --after="2024-01-01" --before="2024-06-01" # Search commit messages -weight: 500;">git log --grep="authentication" # See what changed in each commit -weight: 500;">git log -p # Show stats (files changed, insertions, deletions) -weight: 500;">git log --stat -weight: 500;">git log # Full log -weight: 500;">git log --oneline # Compact: one commit per line -weight: 500;">git log --oneline --graph # ASCII branch graph -weight: 500;">git log --oneline --graph --all # Include all branches # Filter by author -weight: 500;">git log --author="Jane" # Filter by date -weight: 500;">git log --since="2 weeks ago" -weight: 500;">git log --after="2024-01-01" --before="2024-06-01" # Search commit messages -weight: 500;">git log --grep="authentication" # See what changed in each commit -weight: 500;">git log -p # Show stats (files changed, insertions, deletions) -weight: 500;">git log --stat -weight: 500;">git log # Full log -weight: 500;">git log --oneline # Compact: one commit per line -weight: 500;">git log --oneline --graph # ASCII branch graph -weight: 500;">git log --oneline --graph --all # Include all branches # Filter by author -weight: 500;">git log --author="Jane" # Filter by date -weight: 500;">git log --since="2 weeks ago" -weight: 500;">git log --after="2024-01-01" --before="2024-06-01" # Search commit messages -weight: 500;">git log --grep="authentication" # See what changed in each commit -weight: 500;">git log -p # Show stats (files changed, insertions, deletions) -weight: 500;">git log --stat -weight: 500;">git show abc1234 # Show commit details + diff -weight: 500;">git show abc1234:src/app.js # Show a file as it was at that commit -weight: 500;">git show abc1234 # Show commit details + diff -weight: 500;">git show abc1234:src/app.js # Show a file as it was at that commit -weight: 500;">git show abc1234 # Show commit details + diff -weight: 500;">git show abc1234:src/app.js # Show a file as it was at that commit -weight: 500;">git diff # Unstaged changes vs last commit -weight: 500;">git diff --staged # Staged changes vs last commit -weight: 500;">git diff main feature-branch # Diff between two branches -weight: 500;">git diff abc1234 def5678 # Diff between two commits -weight: 500;">git diff # Unstaged changes vs last commit -weight: 500;">git diff --staged # Staged changes vs last commit -weight: 500;">git diff main feature-branch # Diff between two branches -weight: 500;">git diff abc1234 def5678 # Diff between two commits -weight: 500;">git diff # Unstaged changes vs last commit -weight: 500;">git diff --staged # Staged changes vs last commit -weight: 500;">git diff main feature-branch # Diff between two branches -weight: 500;">git diff abc1234 def5678 # Diff between two commits -weight: 500;">git branch # List local branches -weight: 500;">git branch -a # List local + remote branches -weight: 500;">git branch feature/login # Create a new branch -weight: 500;">git switch feature/login # Switch to it -weight: 500;">git switch -c feature/login # Create AND switch in one command # Old syntax (still works everywhere) -weight: 500;">git checkout -b feature/login -weight: 500;">git branch # List local branches -weight: 500;">git branch -a # List local + remote branches -weight: 500;">git branch feature/login # Create a new branch -weight: 500;">git switch feature/login # Switch to it -weight: 500;">git switch -c feature/login # Create AND switch in one command # Old syntax (still works everywhere) -weight: 500;">git checkout -b feature/login -weight: 500;">git branch # List local branches -weight: 500;">git branch -a # List local + remote branches -weight: 500;">git branch feature/login # Create a new branch -weight: 500;">git switch feature/login # Switch to it -weight: 500;">git switch -c feature/login # Create AND switch in one command # Old syntax (still works everywhere) -weight: 500;">git checkout -b feature/login # Switch to the branch you want to merge INTO -weight: 500;">git switch main # Merge feature branch -weight: 500;">git merge feature/login # Merge with a commit even if fast-forward is possible (preserves history) -weight: 500;">git merge --no-ff feature/login # Switch to the branch you want to merge INTO -weight: 500;">git switch main # Merge feature branch -weight: 500;">git merge feature/login # Merge with a commit even if fast-forward is possible (preserves history) -weight: 500;">git merge --no-ff feature/login # Switch to the branch you want to merge INTO -weight: 500;">git switch main # Merge feature branch -weight: 500;">git merge feature/login # Merge with a commit even if fast-forward is possible (preserves history) -weight: 500;">git merge --no-ff feature/login Fast-forward (linear history): main: A → B → C → D → E ↑ feature merged cleanly Merge commit (preserves branch context): main: A → B → C → M ↗ ↑ merge commit feature: D → E Fast-forward (linear history): main: A → B → C → D → E ↑ feature merged cleanly Merge commit (preserves branch context): main: A → B → C → M ↗ ↑ merge commit feature: D → E Fast-forward (linear history): main: A → B → C → D → E ↑ feature merged cleanly Merge commit (preserves branch context): main: A → B → C → M ↗ ↑ merge commit feature: D → E -weight: 500;">git branch -d feature/login # Delete (safe — won't delete unmerged branches) -weight: 500;">git branch -D feature/login # Force delete -weight: 500;">git push origin --delete feature/login # Delete remote branch -weight: 500;">git branch -d feature/login # Delete (safe — won't delete unmerged branches) -weight: 500;">git branch -D feature/login # Force delete -weight: 500;">git push origin --delete feature/login # Delete remote branch -weight: 500;">git branch -d feature/login # Delete (safe — won't delete unmerged branches) -weight: 500;">git branch -D feature/login # Force delete -weight: 500;">git push origin --delete feature/login # Delete remote branch -weight: 500;">git switch feature/login -weight: 500;">git rebase main -weight: 500;">git switch feature/login -weight: 500;">git rebase main -weight: 500;">git switch feature/login -weight: 500;">git rebase main main: A → B → C feature: D → E main: A → B → C feature: D → E main: A → B → C feature: D → E main: A → B → C feature: D' → E' (commits replayed on top of C) main: A → B → C feature: D' → E' (commits replayed on top of C) main: A → B → C feature: D' → E' (commits replayed on top of C) -weight: 500;">git rebase -i HEAD~3 # Interactively edit the last 3 commits -weight: 500;">git rebase -i HEAD~3 # Interactively edit the last 3 commits -weight: 500;">git rebase -i HEAD~3 # Interactively edit the last 3 commits -weight: 500;">git remote -v # List remotes -weight: 500;">git remote add origin https://github.com/user/repo.-weight: 500;">git # Add a remote -weight: 500;">git remote rename origin upstream # Rename a remote -weight: 500;">git remote -weight: 500;">remove origin # Remove a remote -weight: 500;">git remote -v # List remotes -weight: 500;">git remote add origin https://github.com/user/repo.-weight: 500;">git # Add a remote -weight: 500;">git remote rename origin upstream # Rename a remote -weight: 500;">git remote -weight: 500;">remove origin # Remove a remote -weight: 500;">git remote -v # List remotes -weight: 500;">git remote add origin https://github.com/user/repo.-weight: 500;">git # Add a remote -weight: 500;">git remote rename origin upstream # Rename a remote -weight: 500;">git remote -weight: 500;">remove origin # Remove a remote # Push local branch to remote -weight: 500;">git push origin main # Push and set upstream tracking (then you can just use `-weight: 500;">git push`) -weight: 500;">git push -u origin main # Pull = fetch + merge -weight: 500;">git pull origin main # Pull with rebase instead of merge (cleaner) -weight: 500;">git pull --rebase origin main # Fetch remote changes without merging -weight: 500;">git fetch origin -weight: 500;">git fetch --all # Fetch all remotes # Push local branch to remote -weight: 500;">git push origin main # Push and set upstream tracking (then you can just use `-weight: 500;">git push`) -weight: 500;">git push -u origin main # Pull = fetch + merge -weight: 500;">git pull origin main # Pull with rebase instead of merge (cleaner) -weight: 500;">git pull --rebase origin main # Fetch remote changes without merging -weight: 500;">git fetch origin -weight: 500;">git fetch --all # Fetch all remotes # Push local branch to remote -weight: 500;">git push origin main # Push and set upstream tracking (then you can just use `-weight: 500;">git push`) -weight: 500;">git push -u origin main # Pull = fetch + merge -weight: 500;">git pull origin main # Pull with rebase instead of merge (cleaner) -weight: 500;">git pull --rebase origin main # Fetch remote changes without merging -weight: 500;">git fetch origin -weight: 500;">git fetch --all # Fetch all remotes -weight: 500;">git push # Pushes to tracked remote branch -weight: 500;">git pull # Pulls from tracked remote branch -weight: 500;">git branch -vv # Shows tracking info for all branches -weight: 500;">git push # Pushes to tracked remote branch -weight: 500;">git pull # Pulls from tracked remote branch -weight: 500;">git branch -vv # Shows tracking info for all branches -weight: 500;">git push # Pushes to tracked remote branch -weight: 500;">git pull # Pulls from tracked remote branch -weight: 500;">git branch -vv # Shows tracking info for all branches # Fix the last commit message -weight: 500;">git commit --amend -m "correct message" # Add a forgotten file to the last commit -weight: 500;">git add forgotten-file.js -weight: 500;">git commit --amend --no-edit # Keeps the original message # Fix the last commit message -weight: 500;">git commit --amend -m "correct message" # Add a forgotten file to the last commit -weight: 500;">git add forgotten-file.js -weight: 500;">git commit --amend --no-edit # Keeps the original message # Fix the last commit message -weight: 500;">git commit --amend -m "correct message" # Add a forgotten file to the last commit -weight: 500;">git add forgotten-file.js -weight: 500;">git commit --amend --no-edit # Keeps the original message -weight: 500;">git restore --staged file.js # Unstage (keep changes in working tree) -weight: 500;">git restore file.js # Discard working tree changes (DESTRUCTIVE) -weight: 500;">git restore --staged file.js # Unstage (keep changes in working tree) -weight: 500;">git restore file.js # Discard working tree changes (DESTRUCTIVE) -weight: 500;">git restore --staged file.js # Unstage (keep changes in working tree) -weight: 500;">git restore file.js # Discard working tree changes (DESTRUCTIVE) -weight: 500;">git revert abc1234 # Creates a new commit that undoes abc1234 -weight: 500;">git revert HEAD # Revert the last commit -weight: 500;">git revert HEAD~3..HEAD # Revert the last 3 commits -weight: 500;">git revert abc1234 # Creates a new commit that undoes abc1234 -weight: 500;">git revert HEAD # Revert the last commit -weight: 500;">git revert HEAD~3..HEAD # Revert the last 3 commits -weight: 500;">git revert abc1234 # Creates a new commit that undoes abc1234 -weight: 500;">git revert HEAD # Revert the last commit -weight: 500;">git revert HEAD~3..HEAD # Revert the last 3 commits -weight: 500;">git reset --soft HEAD~1 # Undo last commit, keep changes STAGED -weight: 500;">git reset --mixed HEAD~1 # Undo last commit, keep changes UNSTAGED (default) -weight: 500;">git reset --hard HEAD~1 # Undo last commit, DISCARD all changes -weight: 500;">git reset --soft HEAD~1 # Undo last commit, keep changes STAGED -weight: 500;">git reset --mixed HEAD~1 # Undo last commit, keep changes UNSTAGED (default) -weight: 500;">git reset --hard HEAD~1 # Undo last commit, DISCARD all changes -weight: 500;">git reset --soft HEAD~1 # Undo last commit, keep changes STAGED -weight: 500;">git reset --mixed HEAD~1 # Undo last commit, keep changes UNSTAGED (default) -weight: 500;">git reset --hard HEAD~1 # Undo last commit, DISCARD all changes -weight: 500;">git reflog # See the full history of HEAD movements -weight: 500;">git reset --hard abc1234 # Jump back to any previous state -weight: 500;">git reflog # See the full history of HEAD movements -weight: 500;">git reset --hard abc1234 # Jump back to any previous state -weight: 500;">git reflog # See the full history of HEAD movements -weight: 500;">git reset --hard abc1234 # Jump back to any previous state -weight: 500;">git stash # Stash all uncommitted changes -weight: 500;">git stash push -m "wip: login form validation" # With a label -weight: 500;">git stash list # See all stashes -weight: 500;">git stash pop # Apply most recent stash and -weight: 500;">remove it -weight: 500;">git stash apply stash@{2} # Apply a specific stash (keep it in the list) -weight: 500;">git stash drop stash@{0} # Delete a specific stash -weight: 500;">git stash clear # Delete all stashes # Stash including untracked files -weight: 500;">git stash -u # Create a branch from a stash -weight: 500;">git stash branch feature/wip stash@{0} -weight: 500;">git stash # Stash all uncommitted changes -weight: 500;">git stash push -m "wip: login form validation" # With a label -weight: 500;">git stash list # See all stashes -weight: 500;">git stash pop # Apply most recent stash and -weight: 500;">remove it -weight: 500;">git stash apply stash@{2} # Apply a specific stash (keep it in the list) -weight: 500;">git stash drop stash@{0} # Delete a specific stash -weight: 500;">git stash clear # Delete all stashes # Stash including untracked files -weight: 500;">git stash -u # Create a branch from a stash -weight: 500;">git stash branch feature/wip stash@{0} -weight: 500;">git stash # Stash all uncommitted changes -weight: 500;">git stash push -m "wip: login form validation" # With a label -weight: 500;">git stash list # See all stashes -weight: 500;">git stash pop # Apply most recent stash and -weight: 500;">remove it -weight: 500;">git stash apply stash@{2} # Apply a specific stash (keep it in the list) -weight: 500;">git stash drop stash@{0} # Delete a specific stash -weight: 500;">git stash clear # Delete all stashes # Stash including untracked files -weight: 500;">git stash -u # Create a branch from a stash -weight: 500;">git stash branch feature/wip stash@{0} -weight: 500;">git tag # List all tags -weight: 500;">git tag v1.0.0 # Lightweight tag (just a pointer) -weight: 500;">git tag -a v1.0.0 -m "Release 1.0.0" # Annotated tag (recommended) -weight: 500;">git push origin v1.0.0 # Push a specific tag -weight: 500;">git push origin --tags # Push all tags -weight: 500;">git tag -d v1.0.0 # Delete local tag -weight: 500;">git push origin --delete v1.0.0 # Delete remote tag -weight: 500;">git tag # List all tags -weight: 500;">git tag v1.0.0 # Lightweight tag (just a pointer) -weight: 500;">git tag -a v1.0.0 -m "Release 1.0.0" # Annotated tag (recommended) -weight: 500;">git push origin v1.0.0 # Push a specific tag -weight: 500;">git push origin --tags # Push all tags -weight: 500;">git tag -d v1.0.0 # Delete local tag -weight: 500;">git push origin --delete v1.0.0 # Delete remote tag -weight: 500;">git tag # List all tags -weight: 500;">git tag v1.0.0 # Lightweight tag (just a pointer) -weight: 500;">git tag -a v1.0.0 -m "Release 1.0.0" # Annotated tag (recommended) -weight: 500;">git push origin v1.0.0 # Push a specific tag -weight: 500;">git push origin --tags # Push all tags -weight: 500;">git tag -d v1.0.0 # Delete local tag -weight: 500;">git push origin --delete v1.0.0 # Delete remote tag # Dependencies node_modules/ vendor/ # Build output dist/ build/ *.min.js # Environment & secrets .env .env.local *.pem *.key # OS files .DS_Store Thumbs.db # Editor files .vscode/ .idea/ *.swp # Dependencies node_modules/ vendor/ # Build output dist/ build/ *.min.js # Environment & secrets .env .env.local *.pem *.key # OS files .DS_Store Thumbs.db # Editor files .vscode/ .idea/ *.swp # Dependencies node_modules/ vendor/ # Build output dist/ build/ *.min.js # Environment & secrets .env .env.local *.pem *.key # OS files .DS_Store Thumbs.db # Editor files .vscode/ .idea/ *.swp # If you added .env to .gitignore but already committed it: -weight: 500;">git rm --cached .env -weight: 500;">git commit -m "chore: -weight: 500;">remove .env from tracking" # If you added .env to .gitignore but already committed it: -weight: 500;">git rm --cached .env -weight: 500;">git commit -m "chore: -weight: 500;">remove .env from tracking" # If you added .env to .gitignore but already committed it: -weight: 500;">git rm --cached .env -weight: 500;">git commit -m "chore: -weight: 500;">remove .env from tracking" main ←── stable production code develop ←── integration branch feature/* ←── new features (branch from develop) release/* ←── release prep (branch from develop) hotfix/* ←── urgent fixes (branch from main) main ←── stable production code develop ←── integration branch feature/* ←── new features (branch from develop) release/* ←── release prep (branch from develop) hotfix/* ←── urgent fixes (branch from main) main ←── stable production code develop ←── integration branch feature/* ←── new features (branch from develop) release/* ←── release prep (branch from develop) hotfix/* ←── urgent fixes (branch from main) main ←── always deployable feature/* ←── branch from main, PR back to main, deploy main ←── always deployable feature/* ←── branch from main, PR back to main, deploy main ←── always deployable feature/* ←── branch from main, PR back to main, deploy main ←── everyone commits here (short-lived branches only) main ←── everyone commits here (short-lived branches only) main ←── everyone commits here (short-lived branches only) # Setup -weight: 500;">git config --global user.name "Name" -weight: 500;">git config --global user.email "email" # Start -weight: 500;">git init -weight: 500;">git clone <url> # Daily workflow -weight: 500;">git -weight: 500;">status -weight: 500;">git add . -weight: 500;">git commit -m "message" -weight: 500;">git push -weight: 500;">git pull # Branches -weight: 500;">git switch -c feature/name -weight: 500;">git merge feature/name -weight: 500;">git rebase main -weight: 500;">git branch -d feature/name # Inspection -weight: 500;">git log --oneline --graph --all -weight: 500;">git diff -weight: 500;">git show <commit> # Undo -weight: 500;">git restore --staged <file> -weight: 500;">git revert <commit> -weight: 500;">git reset --soft HEAD~1 -weight: 500;">git reflog # Remote -weight: 500;">git remote add origin <url> -weight: 500;">git fetch --all -weight: 500;">git push -u origin main # Setup -weight: 500;">git config --global user.name "Name" -weight: 500;">git config --global user.email "email" # Start -weight: 500;">git init -weight: 500;">git clone <url> # Daily workflow -weight: 500;">git -weight: 500;">status -weight: 500;">git add . -weight: 500;">git commit -m "message" -weight: 500;">git push -weight: 500;">git pull # Branches -weight: 500;">git switch -c feature/name -weight: 500;">git merge feature/name -weight: 500;">git rebase main -weight: 500;">git branch -d feature/name # Inspection -weight: 500;">git log --oneline --graph --all -weight: 500;">git diff -weight: 500;">git show <commit> # Undo -weight: 500;">git restore --staged <file> -weight: 500;">git revert <commit> -weight: 500;">git reset --soft HEAD~1 -weight: 500;">git reflog # Remote -weight: 500;">git remote add origin <url> -weight: 500;">git fetch --all -weight: 500;">git push -u origin main # Setup -weight: 500;">git config --global user.name "Name" -weight: 500;">git config --global user.email "email" # Start -weight: 500;">git init -weight: 500;">git clone <url> # Daily workflow -weight: 500;">git -weight: 500;">status -weight: 500;">git add . -weight: 500;">git commit -m "message" -weight: 500;">git push -weight: 500;">git pull # Branches -weight: 500;">git switch -c feature/name -weight: 500;">git merge feature/name -weight: 500;">git rebase main -weight: 500;">git branch -d feature/name # Inspection -weight: 500;">git log --oneline --graph --all -weight: 500;">git diff -weight: 500;">git show <commit> # Undo -weight: 500;">git restore --staged <file> -weight: 500;">git revert <commit> -weight: 500;">git reset --soft HEAD~1 -weight: 500;">git reflog # Remote -weight: 500;">git remote add origin <url> -weight: 500;">git fetch --all -weight: 500;">git push -u origin main # Remove a file from ALL history (nuclear option) -weight: 500;">git filter-branch --force --index-filter \ "-weight: 500;">git rm --cached --ignore-unmatch path/to/secret.env" \ --prune-empty --tag-name-filter cat -- --all # Then force push and rotate your credentials immediately -weight: 500;">git push origin --force --all # Remove a file from ALL history (nuclear option) -weight: 500;">git filter-branch --force --index-filter \ "-weight: 500;">git rm --cached --ignore-unmatch path/to/secret.env" \ --prune-empty --tag-name-filter cat -- --all # Then force push and rotate your credentials immediately -weight: 500;">git push origin --force --all # Remove a file from ALL history (nuclear option) -weight: 500;">git filter-branch --force --index-filter \ "-weight: 500;">git rm --cached --ignore-unmatch path/to/secret.env" \ --prune-empty --tag-name-filter cat -- --all # Then force push and rotate your credentials immediately -weight: 500;">git push origin --force --all # When a merge conflict occurs, Git marks the file: <<<<<<< HEAD your changes ======= incoming changes >>>>>>> feature/login # After resolving manually: -weight: 500;">git add resolved-file.js -weight: 500;">git commit # or -weight: 500;">git rebase --continue if rebasing # When a merge conflict occurs, Git marks the file: <<<<<<< HEAD your changes ======= incoming changes >>>>>>> feature/login # After resolving manually: -weight: 500;">git add resolved-file.js -weight: 500;">git commit # or -weight: 500;">git rebase --continue if rebasing # When a merge conflict occurs, Git marks the file: <<<<<<< HEAD your changes ======= incoming changes >>>>>>> feature/login # After resolving manually: -weight: 500;">git add resolved-file.js -weight: 500;">git commit # or -weight: 500;">git rebase --continue if rebasing -weight: 500;">git revert HEAD # If others may have pulled it -weight: 500;">git push origin --force # Only if no one else has the commits -weight: 500;">git revert HEAD # If others may have pulled it -weight: 500;">git push origin --force # Only if no one else has the commits -weight: 500;">git revert HEAD # If others may have pulled it -weight: 500;">git push origin --force # Only if no one else has the commits # Use rebase by default -weight: 500;">git config --global pull.rebase true # Use rebase by default -weight: 500;">git config --global pull.rebase true # Use rebase by default -weight: 500;">git config --global pull.rebase true - Repository (repo) → A project tracked by Git (the .-weight: 500;">git folder) - Commit → A snapshot of your files at a point in time - Branch → An independent line of development - Remote → A copy of the repo hosted elsewhere (GitHub, GitLab, etc.) - Working tree → The files you're currently editing - Staging area (index) → Where you prepare changes before committing - Git installed: -weight: 500;">git-scm.com - A terminal you're comfortable with - (Optional) A GitHub account for remote repos - Setup — configuring Git globally for clean commit attribution - Core workflow — stage, commit, push — the heartbeat of Git - Branching — creating, merging, and deleting branches with confidence - Rebasing — rewriting history for a cleaner log - Remotes — pushing, pulling, fetching, and tracking - Undoing — revert, reset, restore, and the reflog safety net - Stashing — saving work-in-progress without a commit - Tags — marking releases with annotated tags - Branching strategies — Git Flow vs GitHub Flow vs Trunk-based - Common pitfalls — handling conflicts, secrets, and wrong-branch pushes - GitHub Actions — automate CI/CD triggered by Git events - Signed commits — verify your identity with GPG keys - -weight: 500;">git bisect — binary search your history to find which commit introduced a bug - Worktrees — check out multiple branches at once in different directories