Description 592 -> 248 chars, body 756 -> 515 words, Gotchas 8 -> 4. The audit found the dispatch table had no row for a worktree on an existing local branch, so that request fell to the adjacent -B row, which resets the branch to HEAD and discards its commits. Non-destructive create is now the first row and -B names its own destructiveness. Adds the missing lock/unlock row and repair's run-from constraint.
1.4 KiB
git-worktrees
Manage git worktrees to enable multi-branch parallel development across isolated directories.
What it does
This skill handles worktree operations within the git workflow suite. It creates, lists, locks/unlocks, moves, removes, prunes, and repairs worktrees — letting an agent work on multiple branches simultaneously without stashing. It returns structured results (paths, branches, lock status) suitable for agent composition. For multi-step flows spanning branch strategy plus worktree setup, git-workflow handles the broader orchestration and delegates the worktree mechanics here.
Usage
/git-worktrees
Describe your worktree task: create a worktree for a branch, list existing worktrees, lock one for removable media, move, remove, prune, or repair. The skill will handle the operation with appropriate safety checks and return results.
Files
| File | Purpose |
|---|---|
SKILL.md |
Dispatch table, per-operation gates, and the report format |
references/README.md |
Describes the references directory contents |
references/worktrees.md |
Read when an operation needs more than the dispatch table: shared vs. per-worktree state, the add command forms, the full add flag table, orphan branches, sparse-checkout, removable-media locking, remote disambiguation, where to run repair from, config keys, and the emergency-fix and PR-review patterns |
references/sources.md |
Research sources and provenance |