git-cleanup

npx skills add trailofbits/skills --skill git-cleanup --agent claude-code

Same command for any agent — swap --agent for codex, cursor, copilot.

# Git Cleanup Safely clean up accumulated git worktrees and local branches by categorizing them into: safely deletable (merged), potentially related (similar themes), and active work (keep). ## When to Use - When the user has accumulated many local branches and worktrees - When branches have been merged but not cleaned up locally - When remote branches have been deleted but local tracking branches remain ## When NOT to Use - Do not use for remote branch management (this is local cleanup only) - Do not use for repository maintenance tasks like gc or prune - Not designed for headless or non-interactive automation (requires user confirmations at two gates) ## Core Principle: SAFETY FIRST **Never delete anything without explicit user confirmation.** This skill uses a gated workflow where users must approve each step before any destructive action. ## Critical Implementation Notes ### Squash-Merged Branches Require Force Delete **IMPORTANT:** `git branch -d` will ALWAYS fail for squash-merged branches because git cannot detect that the work was incorporated. This is expected behavior, not an error. When you identify a branch as squash-merged: - Plan to use `git branch -D` (force delete)

Extract common prefixes from branch names
git log --oneline "$default_branch".."$branch"
Search by: branch name, commit message keywords, PR numbers
git log --oneline "$default_branch" | grep -iE "(branch-name|keyword|#[0-9]+)"
git log --oneline "$default_branch" | grep -iE "(#[0-9]+)" | head -20
Get default branch name
Protected branches - never analyze or delete
List all local branches with tracking info
git branch -vv
List all worktrees