# Squash last 3 commits
git rebase -i HEAD~3

# Rebase onto main (update feature branch)
git fetch origin
git rebase origin/main

# 1. Fix conflicts in files
# 2. Stage fixed files
git add <files>
# 3. Continue rebase
git rebase --continue
# 4. If it's hopeless
git rebase --abort

# Pick one commit from another branch
git cherry-pick <commit-hash>

# Pick without committing (stage only)
git cherry-pick --no-commit <hash>

# Pick a range
git cherry-pick <oldest>..<newest>

# Stash with message
git stash push -m "WIP: feature X"

# Stash specific files
git stash push -m "partial" -- file1.ts file2.ts

# List stashes
git stash list

# Apply and keep
git stash apply stash@{0}

# Apply and remove
git stash pop

# Show stash contents
git stash show -p stash@{0}

# See conflict details
git diff --check

# Use merge tool
git mergetool

# Accept theirs / ours for specific file
git checkout --theirs <file>
git checkout --ours <file>

# Create worktree for a branch
git worktree add ../my-feature feature-branch

# List worktrees
git worktree list

# Remove when done
git worktree remove ../my-feature

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

# Find lost commits
git reflog

# Restore deleted branch
git checkout -b recovered <reflog-hash>

# Unstage file
git restore --staged <file>

# Discard changes in file
git restore <file>

git log --oneline --graph --all    # Visual branch history
git diff --stat                     # Summary of changes
git log --author="name" --oneline  # Commits by author
git shortlog -sn                   # Commit count by author