New: 98,000+ skills indexed from GitHub repos with 100+ stars · every skill safety-checkedBrowse top skillsTop skills
Esc to closeBrowse all skills
Submit a skillBrowse skills
Submit a skillBrowse skills

Agent skill

Worktree Rebase Merge

by tisfeng in tisfeng/Easydict

将当前 worktree 的任务提交 rebase 到本地目标分支，并从目标 worktree 合并。用于明确要求本地集成；仅创建提交使用 git-commit。

GPL-3.0Auto-check passedDevelopment

Install Worktree Rebase Merge

skills CLI
$ npx skills add tisfeng/Easydict --skill worktree-rebase-merge -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install tisfeng/Easydict worktree-rebase-merge --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/tisfeng/Easydict.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/worktree-rebase-merge .claude/skills/worktree-rebase-merge && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
worktree-rebase-merge
GitHub stars
15k
Token cost
~408 tokens
SKILL.md length
125 words
Files
6 (incl. scripts, references)
Skills in repo
8
Repo updated
First seen
Licence
GPL-3.0

At a glance

将当前 worktree 的任务提交 rebase 到本地目标分支，并从目标 worktree 合并。用于明确要求本地集成；仅创建提交使用 git-commit。

  • Works in 7 steps: 读取 集成协议，使用其只读 helper 收集稳定的源/目标事实。 → 用户指定目标时使用该分支；否则按集成协议实时解析远程默认分支。目标或 remote → detached HEAD 按集成协议挂接到不覆盖现有 ref 的任务分支。没有… → …
  • Tasks that involve Git worktrees
  • SKILL.md covers 依赖与授权, Git 状态保护, 主流程 and 完成与停止条件
  • Runs Python scripts from its folder; calls git

What it does

Worktree Rebase Merge is an agent skill from tisfeng/Easydict. 将当前 worktree 的任务提交 rebase 到本地目标分支，并从目标 worktree 合并。用于明确要求本地集成；仅创建提交使用 git-commit。

Its SKILL.md is about 410 tokens, which your agent loads only when the skill is triggered. The skill folder holds 9 other files, including scripts and reference files (for example `agents/openai.yaml`, `references/integration-workflow.md` and `references/reporting.md`).

It sits in Development, covering Git worktrees, Commit messages and Git workflow. It works with Git. The repository describes itself as: 一个简洁优雅的词典翻译 macOS App。开箱即用，支持离线 OCR 识别，支持有道词典，🍎 苹果系统词典，🍎 苹果系统翻译，OpenAI，Gemini，DeepL，Google，Bing，腾讯，百度，阿里，小牛，彩云和火山翻译。A concise and elegant Dictionary and Translator macOS App… The licence is GPL-3.0.

When your agent uses it

  • Tasks that involve Git worktrees
  • Tasks that involve Commit messages
  • Tasks that involve Git workflow

Example prompts

  • “/worktree-rebase-merge”

Requirements

  • Python 3

Workflow steps

7 steps, taken from the first numbered list in SKILL.md.

  1. 读取 集成协议，使用其只读 helper 收集稳定的源/目标事实。
  2. 用户指定目标时使用该分支；否则按集成协议实时解析远程默认分支。目标或 remote
  3. detached HEAD 按集成协议挂接到不覆盖现有 ref 的任务分支。没有 staged、unstaged、
  4. 源与目标相同时，只使用 git-commit 完成提交和回执。
  5. 其他情况先用 git-commit 提交获准的源变更，要求源 worktree 干净；再检查完整
  6. 在干净的目标 worktree 执行 git merge 。没有目标 worktree 时，在仓库外创建临时
  7. 读取 集成回执，报告真实分支、OID、worktree、rebase/merge、工作树和

What it can do on your machine

Read from SKILL.md and the folder at commit cfda6e2. It shows what the files ask for, not the result of running them.

  • Tool permissions

    Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.

    From allowed-tools in the SKILL.md frontmatter.

  • Runs code

    Ships 1 file in scripts/ (Python), which the agent can run.

    Shell commands in SKILL.md call:

    • git

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.

    From URLs in SKILL.md, links to its own repository left out.

  • Credentials

    Names no API keys, tokens, secrets or passwords.

    From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Worktree Rebase Merge loads about 408 tokens when it runs, and up to ~2k if it reads all its reference files. Until then it costs about 26 tokens; SKILL.md has 125 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~26
When it runs · the whole SKILL.md, loaded when a task matches
~408
With references · SKILL.md plus every file in references/, read only if the agent opens them
~2k

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check passed

The automated check found no risky patterns in SKILL.md.

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); the scripts in this folder are not scanned.

SKILL.md

The full file from tisfeng/Easydict at commit cfda6e2, republished under its GPL-3.0 licence (© tisfeng). 125 words, ~408 tokens.

Download SKILL.mdSave it as .claude/skills/worktree-rebase-merge/SKILL.md (or your agent's skills folder). This skill also uses 5 other files; get the full folder from GitHub.
name
worktree-rebase-merge
description
将当前 worktree 的任务提交 rebase 到本地目标分支，并从目标 worktree 合并。用于明确要求本地集成；仅创建提交使用 git-commit。

Worktree Rebase/Merge 工作流

将当前 checkout 视为源：必要时创建任务分支并提交，rebase 到目标分支， 再从目标分支的 worktree 合并。源与目标相同时只提交，不 rebase 或 merge。

依赖与授权

完整交付依赖 git-commit 的提交、分支命名和已有提交回执能力。从当前 Skill 清单 定位实际入口，未提供位置时才检查 同级安装位置。缺失时可完成 只读预检，但在首次分支、暂存、提交、rebase 或 merge 写入前停止。

本 Skill 只在用户明确要求本地集成时执行 Git 写入。仅预览或只读请求不创建分支/ worktree、不暂存、提交、rebase 或 merge。除非用户明确要求，不 fetch、pull 或 push。

Git 状态保护

  • 开始前确认允许路径、提交范围、用户限制，以及源/目标的 HEAD、索引、工作树、 worktree 占用和进行中操作。
  • Git 写操作串行执行；每次写入前复验相关状态，写入后确认结果符合预期。
  • rebase 前冻结源提交范围与目标 OID；rebase 后核对改写结果。merge 前确认源干净、 目标仍为冻结 OID，且目标 worktree 没有漂移。
  • 不使用 reset、强制移动 ref、stash 或 clean，不切换用户其他 checkout 的分支。
  • 发现非预期漂移、未解冲突、范围不一致、不能安全处理的语义冲突或权限拒绝时， 保留现场并停止后续写入。

主流程

  1. 读取 集成协议，使用其只读 helper 收集稳定的源/目标事实。
  2. 用户指定目标时使用该分支；否则按集成协议实时解析远程默认分支。目标或 remote 有歧义、无法证明实时默认分支或本地目标不存在时，在写入前停止并请用户指定。
  3. detached HEAD 按集成协议挂接到不覆盖现有 ref 的任务分支。没有 staged、unstaged、 untracked 或相对目标的提交时，不创建空分支。
  4. 源与目标相同时，只使用 git-commit 完成提交和回执。
  5. 其他情况先用 git-commit 提交获准的源变更，要求源 worktree 干净；再检查完整 <target>..<source> 提交和路径范围，执行 git rebase <target> 并验证改写结果。
  6. 在干净的目标 worktree 执行 git merge <source>。没有目标 worktree 时，在仓库外创建临时 worktree，成功合并后删除；冲突或失败时保留供恢复。
  7. 读取 集成回执，报告真实分支、OID、worktree、rebase/merge、工作树和 Push 状态；单提交或多提交统计复用 git-commit 的回执契约。

完成与停止条件

直接提交模式在 git-commit 完成时结束。普通集成只有在源已成功 rebase、目标从冻结 OID 按预期合并、源与目标最终状态已验证且回执完整时才算完成。目标只有脏 worktree 时，允许先完成源提交，然后在 rebase/merge 前暂停；恢复步骤见集成协议。

© tisfeng, GPL-3.0. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

SKILL.md and 5 other files (scripts, references) in .agents/skills/worktree-rebase-merge of tisfeng/Easydict.

  • SKILL.md
  • agents/openai.yaml
  • references/integration-workflow.md
  • references/reporting.md
  • scripts/collect-integration-facts.py
  • tests/test_collect_integration_facts.py

Open the folder on GitHubat commit cfda6e2

Compare with similar skills

Worktree Rebase Merge next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Worktree Rebase Merge compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Worktree Rebase Merge this skilltisfeng/Easydict15k—~408Automated safety check: PassGPL-3.0
Conventional Gitsamber/cc-skills227—~1.8kAutomated safety check: PassMIT
Oma Scmfirst-fluke/oh-my-agent1.3k—~3.3kAutomated safety check: NotesMIT
Git WorkflowEliasOulkadi/shokunin114—~2.4kAutomated safety check: NotesMIT
Git Workflowericrisco/rsc-harness180—~3.5kAutomated safety check: PassMIT
Finishing a Development Branchobra/superpowers297k5 repos~1.9kAutomated safety check: PassMIT

Similar skills

  • Conventional Git

    samber/cc-skills

    Conventional Commits v1.0.0 branch naming, worktree naming, and commit message standards for GitHub and GitLab projects.

    227 GitHub stars~1.8k tokensUpdated 10 days ago
    DevelopmentAuto-check passed

  • Oma Scm

    first-fluke/oh-my-agent

    SCM (software configuration management) and Git — branching, merges, conflicts, worktrees, baselines, audit readiness, plus Conventional Commits and safe staging.

    1.3k GitHub stars~3.3k tokensUpdated yesterday
    DevelopmentAuto-check: notes

  • Git Workflow

    EliasOulkadi/shokunin

    Automate the complete Git development workflow — create feature branches with conventional naming, atomic commits with conventional commit messages, interactive rebase, squash merges, PR body…

    114 GitHub stars~2.4k tokensUpdated 6 days ago
    DevelopmentAuto-check: notes

  • Git Workflow

    ericrisco/rsc-harness

    A skill your agent uses when naming or scoping a branch, writing or fixing a commit message, picking the gitmoji for a commit, untangling history (rebase versus merge versus squash), or cutting a…

    180 GitHub stars~3.5k tokensUpdated yesterday
    DevelopmentAuto-check passed

  • Finishing a Development Branch

    obra/superpowers

    Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.

    297k GitHub starsUsed in 5 repos~1.9k tokens
    DevelopmentAuto-check passed

  • ToolJet Multi-Repo Commit

    ToolJet/ToolJet

    Commits changes across ToolJet's root repo and its server/ee and frontend/ee submodules, writing messages from the diffs and updating submodule pointers in order.

    41k GitHub stars~1.3k tokensUpdated yesterday
    DevelopmentAuto-check passed

More from tisfeng/Easydict

All 8 skills in this repo

  • Fireworks Tech Graph

    tisfeng/Easydict

    Create precise SVG technical diagrams, export PNG or offline HTML, and animate supported semantic SVGs to GIF.

    15k GitHub starsUsed in 1 repo~1.4k tokens
    Auto-check passed

  • Release Easydict

    tisfeng/Easydict

    编排 Easydict macOS 的 draft、publish、release 和 resume，整理英文 GitHub Release 内容，并处理发布后的 Issue 跟进及本地清理。不用于一般的发布流程设计讨论。

    15k GitHub stars~810 tokensUpdated 4 days ago
    Auto-check passed

  • Submit PR

    tisfeng/Easydict

    创建或复用当前 checkout 已提交变更的 GitHub PR，必要时推送任务分支。PR 审查使用 review-pr；仅本地提交使用 git-commit。

    15k GitHub stars~595 tokensUpdated 4 days ago
    Auto-check passed

  • Git Commit

    tisfeng/Easydict

    起草、创建或汇报 Angular-style 本地 Git 提交。用于明确的提交交付；分支集成使用 worktree-rebase-merge，不 push。

    15k GitHub stars~535 tokensUpdated 4 days ago
    Auto-check passed

  • Review

    tisfeng/Easydict

    审查本地工作树、提交、range、文件或模块，找出有证据的缺陷。GitHub PR 审查使用 review-pr；代码清理使用 code-simplifier。

    15k GitHub stars~659 tokensUpdated 4 days ago
    Auto-check passed

  • Review PR

    tisfeng/Easydict

    审查 GitHub PR 的准确 head/base diff、关联 issue、CI 和 review threads，交付前刷新。创建 PR 使用 submit-pr；本地审查使用 review。

    15k GitHub stars~723 tokensUpdated 4 days ago
    Auto-check passed

Works with

Categories

Questions about Worktree Rebase Merge

What does Worktree Rebase Merge do?

将当前 worktree 的任务提交 rebase 到本地目标分支，并从目标 worktree 合并。用于明确要求本地集成；仅创建提交使用 git-commit。. Worktree Rebase Merge is an agent skill from tisfeng/Easydict.

When should I use Worktree Rebase Merge?

Worktree Rebase Merge fits situations like: tasks that involve Git worktrees; tasks that involve Commit messages; tasks that involve Git workflow.

How do I install Worktree Rebase Merge in Claude Code?

Run `npx skills add tisfeng/Easydict --skill worktree-rebase-merge -a claude-code`. Or copy the skill folder (.agents/skills/worktree-rebase-merge in tisfeng/Easydict) into .claude/skills/worktree-rebase-merge in your project. Claude Code loads it when a task matches its description.

How do I install Worktree Rebase Merge in Codex?

Run `npx skills add tisfeng/Easydict --skill worktree-rebase-merge -a codex`. Or copy the skill folder (.agents/skills/worktree-rebase-merge in tisfeng/Easydict) into .agents/skills/worktree-rebase-merge in your project. Codex loads it when a task matches its description.

Can I use Worktree Rebase Merge in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add tisfeng/Easydict --skill worktree-rebase-merge -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/worktree-rebase-merge, .gemini/skills/worktree-rebase-merge, .github/skills/worktree-rebase-merge and .opencode/skills/worktree-rebase-merge in your project.

What does Worktree Rebase Merge need to run?

Going by SKILL.md and its folder, Worktree Rebase Merge needs Python for the scripts in its folder and the command-line tools its instructions call (git). Our summary lists: Python 3.

Does Worktree Rebase Merge access the network?

SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Worktree Rebase Merge safe to install?

Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. The check reads SKILL.md only: the scripts in the folder are not scanned, so read them before running anything.

What licence does Worktree Rebase Merge use?

Worktree Rebase Merge is published under the GPL-3.0 licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Worktree Rebase Merge use?

About 408 tokens (SKILL.md is roughly 1.6k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full. Its references folder adds about 1.6k tokens, read only when the agent opens those files.

What are the alternatives to Worktree Rebase Merge?

Skills that share tags, products or a category with Worktree Rebase Merge: Conventional Git (samber/cc-skills, 227 stars), Oma Scm (first-fluke/oh-my-agent, 1.3k stars), Git Workflow (EliasOulkadi/shokunin, 114 stars) and Git Workflow (ericrisco/rsc-harness, 180 stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Worktree Rebase Merge?

tisfeng (a GitHub user) maintains it in tisfeng/Easydict, which has 14,892 GitHub stars. The repository holds 8 skills in this directory. The repository was last updated on October 6, 2026.

Source: tisfeng/Easydict on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.