Is it safe to delete worktrees with this tool?

Yes, the 'close' command includes safety checks that validate there are no uncommitted changes or unpushed commits before removal, protecting you from accidental data loss.

What is a Git worktree and why use it?

A Git worktree allows you to have multiple branches checked out at the same time in different directories. This is superior to stashing because it lets you work on multiple features in parallel without constant context switching.

Does this support custom base branches?

Absolutely. You can create a worktree from the main branch, your current branch, or specify any other base branch using the --base option.

Can I launch Claude automatically in a new worktree?

Yes, by using the --claude flag during worktree creation, the skill will automatically initialize a Claude session within the new terminal environment.

How does this skill integrate with iTerm2?

It uses Python scripts to communicate with iTerm2, allowing it to automatically open new worktree directories in new tabs, windows, or split panes (vertical or horizontal) based on your preference.

iTerm2 Git Worktree Manager

Name: iTerm2 Git Worktree Manager
Author: chadboyda

bychadboyda

0•

Developer Tools

Streamlines Git worktree management by automating branch creation and iTerm2 window integration for parallel feature development.

iterm-worktree is a Claude Code skill designed to optimize multi-tasking for developers using Git and iTerm2 on macOS. It allows users to seamlessly create isolated development environments for different features, automatically opening them in new iTerm2 tabs, windows, or panes. The tool includes robust safety features to prevent data loss during cleanup—such as checking for uncommitted changes or unpushed commits—and offers a unique integration to launch Claude directly within the new worktree environment for immediate AI-assisted coding.

Key Features

01One-command Claude integration to launch AI assistance in new environments

02Automated Git worktree creation with dedicated iTerm2 tabs or windows

03Intelligent context switching and tab focusing for existing worktrees

04Flexible layout options including tabs, windows, and split panes

05Safety validation for uncommitted and unpushed changes before closure

060 GitHub stars

Use Cases

01Working on a critical hotfix without stashing or interrupting progress on a long-term feature branch

02Simultaneously reviewing a colleague's code in a clean environment while maintaining your local workspace state

03Managing multiple concurrent feature branches by keeping each in an isolated terminal view

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add chadboyda/chadboyda-agent-marketplace iterm-worktree

For use in Claude.ai and ChatGPT

Download Skill