managing-git-worktrees

managing-git-worktrees is a skill for Claude Code, Codex from bahayonghang/my-ai-cli-toolkit. It costs 46 tokens per session (700 once invoked), scanned A, original, MIT.

A safety-focused guide to Git worktrees, which let one repository have several branch folders at the same time. It explains commands for adding, listing, removing, pruning, locking, and unlocking those folders.

In plain words
What is it for?
It helps safely manage parallel branch development, inspect worktree status, remove clean worktrees, and clean up unused worktree records.
Why use it?
It helps prevent accidental loss of uncommitted changes and avoids common worktree errors, such as trying to use a branch already checked out elsewhere.

Skill for Claude CodeCodex

Written for no agent in particular: nothing here depends on one.

Needs its repository: it reads a path above its own folder, which exists only inside the repository. The line is git worktree add -b <new-branch> ../wt/<new-branch> <start-point>.

Good fit It helps safely manage parallel branch development, inspect worktree status, remove clean worktrees, and clean up unused worktree records.

Compare 6 skills from other repositories ↓
Install

Getting it into your agent

It runs from inside its repository, so the clone comes first — what it calls does not travel with the file alone.

Clone the repo
git clone --depth 1 https://github.com/bahayonghang/my-ai-cli-toolkit
agentmods
npx agentmods add skills/bahayonghang/my-ai-cli-toolkit/kndoshn

Made for: Claude Code, Codex.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for managing-git-worktrees

README.md
[![agentmods](https://agentmods.dev/badge/skills/bahayonghang/my-ai-cli-toolkit/kndoshn/github.svg)](https://agentmods.dev/skills/bahayonghang/my-ai-cli-toolkit/kndoshn)
Your own site
<a href="https://agentmods.dev/skills/bahayonghang/my-ai-cli-toolkit/kndoshn"><img src="https://agentmods.dev/badge/skills/bahayonghang/my-ai-cli-toolkit/kndoshn/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

agentmods 80×15 button for managing-git-worktrees

Your own site · 80×15
<a href="https://agentmods.dev/skills/bahayonghang/my-ai-cli-toolkit/kndoshn"><img src="https://agentmods.dev/badge/skills/bahayonghang/my-ai-cli-toolkit/kndoshn.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 46 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 700 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5.1 $0.00046 $0.00700
Opus 5 $0.00023 $0.00350
Sonnet 5 $0.00009 $0.00140
Haiku 4.5 $0.00005 $0.00070

Measured 6d ago against content hash f040f12b5698, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-10, from the pricing page.

Security

Grade A, and why

managing-git-worktrees scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 6d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

.trellis/tasks/archive/2026-08/08-17-git-worktree-skill/research/kndoshn-SKILL.md · 88 lines

How it starts

The opening of the file, as written. The whole thing — 88 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Managing Git Worktrees

Safety Rules (MUST follow)

  1. Never discard uncommitted work - Check git -C <path> status --porcelain before destructive operations
  2. Inspect before mutate - Run --dry-run before prune, list before remove
  3. Avoid --ignore-other-worktrees - Treat as last resort, require explicit confirmation
  4. Quote paths with spaces - Use forward slashes

Command Reference

Task Command
List all git worktree list
List (machine) git worktree list --porcelain
Add existing branch git worktree add <path> <branch>
Add new branch git worktree add -b <new-branch> <path> <start-point>
Add detached git worktree add --detach <path> <commit-ish>
Remove (clean only) git worktree remove <path>
Prune dry-run git worktree prune --dry-run
Prune git worktree prune
Lock git worktree lock <path>
Unlock git worktree unlock <path>

Workflow: Add Worktree for New Task

git worktree add -b <new-branch> ../wt/<new-branch> <start-point>
git -C ../wt/<new-branch> status

If start-point is ambiguous:

git show-ref --heads --remotes | grep <branch-name>

Workflow: Add Worktree for Existing Branch

git branch --list <branch>
git worktree list --porcelain
git worktree add <path> <branch>

Error: "branch is already checked out"

Resolution order (safest first):

  1. Use existing worktree - Check path via git worktree list --porcelain
  2. Create new branch - git worktree add -b <new-branch> <path> <branch>
  3. Detached HEAD - git worktree add --detach <path> $(git rev-parse <branch>)
  4. Force (last resort) - Requires explicit user confirmation:
    git switch --ignore-other-worktrees <branch>
    

Workflow: Cleanup

git worktree list --porcelain
git -C <path> status --porcelain
git worktree remove <path>
git worktree prune --dry-run
git worktree prune

Locked worktree removal (requires explicit confirmation):

Read the full file on GitHub · 88 lines

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 6d ago First seen · 88 lines · 46 tokens per session scan A f040f12b5698

Subscribe to this mod's changes

managing-git-worktrees is a skill published in the GitHub repository bahayonghang/my-ai-cli-toolkit (16 stars, last pushed 2d ago), licensed MIT. It adds 46 tokens to every session and 700 once invoked, about $0.0002 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-09-04.

Related

Other skills, from other repositories

prowler-commit

Creates professional git commits following conventional-commits format. Trigger: When creating commits, after completing code changes, when user asks to commit.

prowler-cloud/prowler · 33 tokens

gh-auth-isolation

Safely manage multiple GitHub identities (EMU + personal) in agent workflows.

github/gh-aw · 20 tokens

comet-github

A routing guide for Comet-related GitHub work. It directs requests about pull requests, issues, CI failures, ideas, and fixes to the appropriate review or implementation process.

rpamis/comet · 72 tokens

github-skill

Work with GitHub via the gh CLI — clone repositories, create/list/merge pull requests, create/list issues, and run any other gh command (API calls, workflow runs, releases, repo administration). List operations return parsed JSON.

zeenie-ai/OpenCompany · 51 tokens

re0-merge

Review and land an external contribution the way this suite does: gate it against the thesis, land it with the author's credit intact, complete a new skill rather than merging it raw, then approve, credit, and explain before closing. Use when reviewing a pull request, as any collaborator or maintainer, not only the…

LilMGenius/paperthin · 70 tokens

nvca-chart-release

Release NVCA Operator chart changes from the native monorepo source to the vendored Helm chart. Use when updating the vendored NVCA Operator chart, changing NVCA image refs, publishing helm-nvca-operator, or validating the chart against a self-managed control plane.

NVIDIA/nvcf · 61 tokens