# Identity (required for every commit)
git config --global user.name "Your Name"
git config --global user.email "your.email@example.com"

# Modern default branch naming
git config --global init.defaultBranch main

# Better diffs and colors
git config --global color.ui auto
git config --global core.pager cat

git status              # Check current state
git add filename        # Stage specific file
git add .               # Stage all changes
git commit -m "msg"     # Save with message
git log --oneline       # View compact history
git diff                # See unstaged changes

git branch              # List branches (* = current)
git branch new-name     # Create branch
git checkout new-name   # Switch to branch (old)
git switch new-name     # Switch to branch (new)
git switch -c new-name  # Create and switch
git branch -d name      # Delete merged branch
git branch -D name      # Force delete

# Standard merge (preserves history, creates merge commit)
git switch main
git merge feature/login

# Squash merge (combines all feature commits into one)
git merge --squash feature/login
git commit -m "Add login feature"

# Fast-forward (linear history, no merge commit)
git merge --ff-only feature/login

# Move feature branch to tip of main
git switch feature/login
git rebase main

# Interactive rebase (edit/squash/reorder commits)
git rebase -i HEAD~3

# If conflicts occur during rebase
# 1. Fix conflicts, 2. git add ., 3. git rebase --continue
git rebase --abort  # Cancel rebase

git remote -v                    # View remotes
git fetch origin                 # Download changes (no merge)
git pull origin main             # Fetch + merge
git push -u origin feature       # Push and track branch
git push origin --delete feature # Remove remote branch
git clone https://...            # Copy repository

# Undo last commit, keep changes staged
git reset --soft HEAD~1

# Undo last commit, unstage changes
git reset HEAD~1

# Undo last commit, discard all changes (DANGER)
git reset --hard HEAD~1

# Create new commit that reverses specific commit
git revert a1b2c3d

# THE LIFESAVER: View all recent HEAD positions
git reflog
git checkout -b recovery HEAD@{2}

git stash push -m "WIP: login form"    # Save with message
git stash list                        # View saved stashes
git stash pop                         # Apply and remove
git stash apply stash@{1}             # Apply specific stash
git stash branch new-branch           # Create branch from stash

[alias]
    co = checkout
    br = branch
    ci = commit
    st = status
    lg = log --oneline --graph --decorate --all
    last = log -1 HEAD
    unstage = reset HEAD --
    undo = reset --soft HEAD~1