agentleFS
pivoshenkopivoshenko/pivoshenko.ai/skills/git-branch-cleanup/SKILL.md

git-branch-cleanup

Skill6 starsChanged 44 days agoMITView on GitHub

Delete local git branches whose remote tracking branch is gone or whose changes are already merged into the base branch. Use when the user asks to clean up branches, prune branches, delete stale branches, or /git-branch-cleanup. Also trigger on "tidy git branches", "remove old branches", "I'm done with these branches", "branch graveyard", or whenever the user complains about local branch clutter. Reports what will be deleted and asks before deleting anything.

We split this skill into the rules it gives an agent

7 rules. 0 are common, 1 is distinctive, and 6 are very specific to this project.

  • 0

    Common

    Most of the 4 edited versions we read keep these.

  • 1

    Distinctive

    This author's own choices. Worth a look.

  • 6

    Very specific

    Tied to their project's names, files or tools. Probably skip.

  • Common
  • Distinctive
  • Very specific
  1. Very specific:

    If user mentioned keep-patterns inline (e.g.

    line 14
  2. Very specific:

    No remote -> compare against the local <base> (git branch --merged <base>) and skip the Gone bucket entirely (no upstreams can exist)

    line 29
  3. Very specific:

    Always preview + confirm. Skip prompt only if user already said "yes delete" / "go ahead" same turn - covers -d only.

    line 45
  4. Very specific:

    Never delete current / base / HEAD

    line 46
  5. Very specific:

    Never -D unmerged without explicit OK.

    line 47
  6. Distinctive:

    Never touch remote branches.

    line 48
  7. Very specific:

    Never git reflog expire / gc --prune=now.

    line 49

“Common” is measured: kept by at least 6 in 10 of the 4 edited versions of this file we could read. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.

Keep what fits and drop the rest. Your version, ready for your agents.
Files
SKILL.md

Git Branch Cleanup

Prune locals = merged OR remote gone. Destructive -> preview + confirm.

Flow

  1. If user mentioned keep-patterns inline (e.g. "but keep spike/*") -> capture them. Else assume none. Don't prompt up front
  2. Parallel:
    • git fetch --all --prune
    • git branch --show-current
  3. Base: user names one -> use it. Else detect: git symbolic-ref --short refs/remotes/origin/HEAD -> strip the origin/; ref missing -> git remote set-head origin -a, re-read; no remote -> main, fall back master. Why -> this is a delete path, and --merged <wrong-base> misclassifies live branches as merged. Compare against origin/<base>, not the local ref -> the local base is often stale or absent entirely (git-branch-create branches off origin/<base> without ever creating it), so a local-ref check either errors or reports branches as unmerged that the remote already has
  4. Candidates:
    • Gone: upstream gone
      git for-each-ref --format='%(refname:short) %(upstream:track)' refs/heads \
        | awk '$2 == "[gone]" {print $1}'
    • Merged: fully merged into the remote base (step 1 already fetched + pruned)
      git branch --merged origin/<base> --format='%(refname:short)'
    • No remote -> compare against the local <base> (git branch --merged <base>) and skip the Gone bucket entirely (no upstreams can exist)
    • Note: squash-merged PRs leave no merge commit, so they won't appear in Merged. Closing the PR deletes the remote -> they show up in Gone instead. The Gone bucket is the catch-all for PR-merged work
    • Union. Exclude:
      • Current
      • Base (main/master)
      • Protected: exact names develop, staging, plus any branch matching the glob release/*. Skip silently if none exist
      • User keep-patterns from step 0 (if provided)
  5. Print grouped by reason (gone vs merged), one line per branch, no prose. Ask confirm
  6. On confirm:
    • Merged: git branch -d <name>. -d re-checks against HEAD/upstream, not origin/<base>, so it can refuse a branch the Merged bucket listed -> that's a safe refusal, not a bug: report it as skipped, don't reach for -D
    • Gone + unmerged: git branch -D <name>. Explicit confirm only
    • Branch checked out in another worktree -> both -d and -D refuse. Same safe refusal: report as skipped, don't force it
  7. Print summary: counts + one line per skipped branch (+ why). No recap of what was already listed

Rules

  • Always preview + confirm. Skip prompt only if user already said "yes delete" / "go ahead" same turn - covers -d only; -D of unmerged work always gets its own named-branch confirm
  • Never delete current / base / HEAD
  • Never -D unmerged without explicit OK. Unsure -> list + let user decide
  • Never touch remote branches. Local only
  • Never git reflog expire / gc --prune=now. Deleted stay recoverable via reflog
  • Empty candidate list -> say so + stop
  • User keep-patterns (wip/*, spike/*) -> off-limits

Download now (ZIP)

Does it work?

Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.

No reviews yet

People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.

  • It worked
  • Partly
  • It didn't
What did you use it for? e.g. Reviewing pull requests in a Rails app

Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.

Your trail

Files you open will collect here, so you can find them again.

Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.

Now do this for your own.

Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.