using-git-worktrees

A guide to using Git worktrees, which are separate working folders connected to one Git repository. They let different branches or agents work in isolation while the current checkout remains unchanged.

In plain words
What is it for?
It helps inspect the repository before branching, create a task-specific worktree, keep local work safe, review the branch, merge intended commits, and remove obsolete worktrees safely.
Why use it?
Isolation lowers the risk that parallel work or experiments overwrite uncommitted changes. It also makes it easier to review, merge, or discard a task independently.

Skill for Claude CodeCodex

Part of the godmode plugin — 34 skills, 1 hook shipped together

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add skills/thiientv/godmode/using-git-worktrees
Any agent
npx skills add thiientv/godmode --skill using-git-worktrees
Clone the repo
git clone --depth 1 https://github.com/thiientv/godmode

Made for: Claude Code, Codex.

Or install godmode, the plugin that ships this one along with the rest of its 34 skills, 1 hook.

Per session 56 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 378 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
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 $0.00056 $0.00378
Opus 5 $0.00028 $0.00189
Sonnet 5 $0.00011 $0.00076
Haiku 4.5 $0.00006 $0.00038

Measured 3d ago against content hash 641d897bb8a9, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

using-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 3d 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.

skills/using-git-worktrees/SKILL.md · 53 lines

What it actually says

Using Git Worktrees

Isolation is a safety boundary, not a way to hide unreviewed changes.

Before creating one

  1. Inspect git status, current branch, repository root, and existing worktrees.
  2. Preserve uncommitted user work; never reset, checkout, or clean it away.
  3. Choose an explicit branch name and a worktree path outside the main working tree when practical.
  4. Confirm the base ref and whether ignored/generated files are needed.

Create safely

git worktree list
git worktree add ../<repo>-<task> -b <task-branch> <base-ref>

Run repository setup in the new worktree, record the exact base commit, and keep secrets and local environment files out of the branch. Do not use the same worktree for two writers.

Finish or discard

  • Review and test the branch before integrating it.
  • Merge or cherry-pick only the intended commits after checking the diff.
  • Remove a disposable worktree only after confirming its commits and needed artifacts are preserved:
git worktree remove ../<repo>-<task>
git worktree prune

Do not force removal when it contains unreviewed work. If a worktree is stale, inspect its branch and status before deciding whether it is recoverable.

Completion condition

The branch's base, ownership, integration path, and cleanup decision are explicit; the main checkout remains intact.

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. 3d ago First seen · 53 lines · 56 tokens per session scan A 641d897bb8a9

Subscribe to this mod's changes

using-git-worktrees is a skill published in the GitHub repository thiientv/godmode (93 stars, last pushed 7d ago), licensed MIT. It adds 56 tokens to every session and 378 once invoked, about $0.0003 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-08-30.

Related

Other skills, from other repositories

agent-evaluation-reporting

Use when summarizing agent evaluations where autonomous, assisted, failed, timed-out, or invalid outcomes must remain distinct and comparable.

sickn33/agentic-awesome-skills · 31 tokens

rulesync

Generates and syncs AI rule configuration files (.cursorrules, CLAUDE.md, copilot-instructions.md) across 20+ coding tools from a single source. Use when syncing AI rules, running rulesync commands, importing or generating rule files, or managing shared AI coding configurations.

dyoshikawa/rulesync · 64 tokens

agent-workspace-linux

Use when a task needs an isolated hidden Linux desktop or workspace-owned browser: GUI app QA, web/browser/shopping automation, sandboxed app observation, or stale workspace cleanup. Routes agent-workspace-linux MCP tools on demand. Does NOT apply to host desktop/Chrome control, generic MCP setup, or pure code/file…

ilysenko/codex-desktop-linux · 70 tokens

ss-component

Generate a new UI component following the StyleSeed design conventions.

bitjaru/styleseed · 14 tokens

loongsuite-pilot-insight

基于 LoongSuite Pilot / AI Coding Agent 日志生成事件洞察、组织洞察、数据质量、研发效能和 AI Native 使用类 SLS 报表时使用;包含 AI Coding 事件表语义,以及团队报表可选的部门维表、deptuser 组织关系、指标口径和公共 CTE,通常与 sls-dashboard-builder 一起使用。.

alibaba/loongsuite-pilot · 91 tokens

map-review

Interactive 4-section code review using monitor, predictor, and evaluator agents plus the user and maintainer role reviewers on current changes. Use when reviewing a diff, PR, or staged work before merge. Do NOT use to plan or implement; use map-plan or map-efficient.

azalio/map-framework · 58 tokens