twig-guide

708u 的头像作者 708u

- 同时或并行处理多个分支 - 在保留当前工作的情况下开始新功能/任务 - 询问git工作树操作(创建、删除、列出、清理) - 提到“twig”命令(添加、删除、清理、列出、初始化) - 将未提交的更改携带或移动到新分支 - 在分支间复制/同步更改 - 需要在单独的目录中隔离工作 - 询问不暂存切换上下文 - 清理旧/已合并分支及其工作树 - 使用“新工作树”、“创建工作树”、“分支出去”、“做其他事情”、“开始新工作”、“并行工作”、“单独工作区”、“另一个分支”等短语 - 用于任何工作树相关操作,而不仅仅是询问twig。

📖 中文导读:- 同时或并行处理多个分支 - 在保留当前工作的情况下开始新功能/任务 - 询问git工作树操作(创建、删除、列出、清理) - 提到“twig”命令(添加、删除、清理、列出、初始化) - 将未提交的更改携带或移动到新分支 - 在分支间复制/同步更改 - 需要在单独的目录中隔离工作 - 询问不暂存切换上下文 - 清理旧/已合并分支及其工作树 - 使用“新工作树”、“创建工作树”、“分支出去”、“做其他事情”、“开始新工作”、“并行工作”、“单独工作区”、“另一个分支”等短语 - 用于任何工作树相关操作,而不仅仅是询问twig。 以下正文为该技能的原始 SKILL.md 内容(英文),上方安装命令可直接使用。

name: twig-guide description: | This skill should be used when the user:

  • Wants to work on multiple branches simultaneously or in parallel
  • Needs to start a new feature/task while preserving current work
  • Asks about git worktree operations (create, remove, list, clean)
  • Mentions "twig" commands (add, remove, clean, list, init)
  • Wants to carry or move uncommitted changes to a new branch
  • Wants to copy/sync changes between branches
  • Needs to isolate work in a separate directory
  • Asks about switching context without stashing
  • Wants to clean up old/merged branches and their worktrees
  • Says phrases like "new worktree", "create worktree", "branch off", "work on something else", "start new work", "parallel work", "separate workspace", "another branch"

Use this skill for ANY worktree-related operation, not just when explicitly asking about twig.

allowed-tools: Read

twig CLI Guide

twig is a CLI tool that simplifies git worktree workflows by automating branch creation, symlinks, and change management in a single command.

Commands Overview

Command Purpose
twig init Initialize twig configuration
twig add <name> Create a new worktree with symlinks
twig remove <branch>... Remove worktrees and their branches
twig list List all worktrees
twig clean Remove unneeded worktrees

Typical Workflows

Start new feature work

Create a new worktree for a feature branch:

twig add feat/new-feature

This creates a worktree at the configured destination directory, creates a new branch if it doesn't exist, and sets up symlinks.

Move current changes to a new branch

When you realize current work should be on a different branch:

twig add feat/correct-branch --carry

The --carry flag moves uncommitted changes to the new worktree. The source worktree becomes clean.

Copy changes to a new branch

When you want changes in both the current and new worktree:

twig add feat/experiment --sync

The --sync flag copies uncommitted changes to both worktrees.

Carry only specific files

When you want to carry only certain files:

twig add feat/new --carry --file "*.go" --file "cmd/**"

Clean up after merging

Remove worktrees for branches that have been merged:

twig clean

This shows candidates and prompts for confirmation. Use --yes to skip the prompt.

Force remove a worktree

Remove a worktree even with uncommitted changes:

twig remove feat/abandoned -f

Use -ff to also remove locked worktrees.

Configuration

see ./references/configuration.md

Command Details

For detailed information on each command, refer to:

  • ./references/commands/add.md - Create worktrees with sync/carry options
  • ./references/commands/remove.md - Remove worktrees and branches
  • ./references/commands/list.md - List worktrees
  • ./references/commands/clean.md - Clean merged worktrees
  • ./references/commands/init.md - Initialize configuration
  • ./references/configuration.md - Configuration file details