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.
Land a finished branch on local main with linear history — commit pending work, commit main's own dirt first, rebase onto main, fast-forward main.
Install Git Rebase Main
$ npx skills add Dimon94/skills --skill git-rebase-main -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install Dimon94/skills git-rebase-main --agent claude-codeProject scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).
$ git clone --depth 1 https://github.com/Dimon94/skills.git skills-src && mkdir -p .claude/skills && cp -r skills-src/skills/git-rebase-main .claude/skills/git-rebase-main && rm -rf skills-srcUse ~/.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/
Install the "git-rebase-main" agent skill from https://github.com/Dimon94/skills/tree/main/skills/git-rebase-main into .claude/skills/git-rebase-main/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-rebase-main", then confirm the skill loads.Claude Code copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$skill-installer install https://github.com/Dimon94/skills/tree/main/skills/git-rebase-mainType this inside Codex. $skill-installer <name> installs a curated skill from openai/skills. The installer writes to $CODEX_HOME/skills (default ~/.codex/skills). Restart Codex if the skill does not show up.
$ npx skills add Dimon94/skills --skill git-rebase-main -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install Dimon94/skills git-rebase-main --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/Dimon94/skills.git skills-src && mkdir -p .agents/skills && cp -r skills-src/skills/git-rebase-main .agents/skills/git-rebase-main && rm -rf skills-srcUse ~/.agents/skills/ instead of .agents/skills for a personal install.
Codex skills documentation · loads skills from .agents/skills/
Install the "git-rebase-main" agent skill from https://github.com/Dimon94/skills/tree/main/skills/git-rebase-main into .agents/skills/git-rebase-main/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-rebase-main", then confirm the skill loads.Codex copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add Dimon94/skills --skill git-rebase-main -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install Dimon94/skills git-rebase-main --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/Dimon94/skills.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/skills/git-rebase-main .cursor/skills/git-rebase-main && rm -rf skills-srcUse ~/.cursor/skills/ instead of .cursor/skills for a personal install.
Cursor skills documentation · loads skills from .cursor/skills/, .agents/skills/, .claude/skills/, .codex/skills/
Install the "git-rebase-main" agent skill from https://github.com/Dimon94/skills/tree/main/skills/git-rebase-main into .cursor/skills/git-rebase-main/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-rebase-main", then confirm the skill loads.Cursor copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gemini skills install https://github.com/Dimon94/skills.git --path skills/git-rebase-main--scope user (default) or --scope workspace; --path is the subfolder of the repo that holds the skill; --consent skips the security confirmation prompt.
$ npx skills add Dimon94/skills --skill git-rebase-main -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install Dimon94/skills git-rebase-main --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/Dimon94/skills.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/skills/git-rebase-main .gemini/skills/git-rebase-main && rm -rf skills-srcUse ~/.gemini/skills/ instead of .gemini/skills for a personal install, then run /skills reload.
Gemini CLI skills documentation · loads skills from .gemini/skills/, .agents/skills/
Install the "git-rebase-main" agent skill from https://github.com/Dimon94/skills/tree/main/skills/git-rebase-main into .gemini/skills/git-rebase-main/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-rebase-main", then confirm the skill loads.Gemini CLI copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gh skill install Dimon94/skills git-rebase-mainInstalls for Copilot at project scope by default; add --scope user for a personal install. Preview a skill first with gh skill preview. Needs GitHub CLI 2.90.0 or later (public preview).
$ npx skills add Dimon94/skills --skill git-rebase-main -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/Dimon94/skills.git skills-src && mkdir -p .github/skills && cp -r skills-src/skills/git-rebase-main .github/skills/git-rebase-main && rm -rf skills-srcUse ~/.copilot/skills/ instead of .github/skills for a personal install. Commit .github/skills so cloud agent and code review can use it.
GitHub Copilot skills documentation · loads skills from .github/skills/, .claude/skills/, .agents/skills/
Install the "git-rebase-main" agent skill from https://github.com/Dimon94/skills/tree/main/skills/git-rebase-main into .github/skills/git-rebase-main/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-rebase-main", then confirm the skill loads.GitHub Copilot copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add Dimon94/skills --skill git-rebase-main -a opencodeOpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
$ gh skill install Dimon94/skills git-rebase-main --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/Dimon94/skills.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/skills/git-rebase-main .opencode/skills/git-rebase-main && rm -rf skills-srcUse ~/.config/opencode/skills/ instead of .opencode/skills for a personal install.
OpenCode skills documentation · loads skills from .opencode/skills/, .claude/skills/, .agents/skills/
Install the "git-rebase-main" agent skill from https://github.com/Dimon94/skills/tree/main/skills/git-rebase-main into .opencode/skills/git-rebase-main/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-rebase-main", then confirm the skill loads.OpenCode copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
Facts
- Skill name
git-rebase-main- GitHub stars
- 107
- Token cost
- ~377 tokens
- SKILL.md length
- 189 words
- Files
- 1
- Skills in repo
- 9
- Repo updated
- First seen
- Licence
- None found
At a glance
Land a finished branch on local main with linear history — commit pending work, commit main's own dirt first, rebase onto main, fast-forward main.
- Works in 6 steps: Commit pending work here → Already on main → done → Commit main's own dirt first → …
- The user asks to rebase/merge/合回主分支 into local main after work is committed
- SKILL.md covers 1. Commit pending work here, 2. Already on main → done, 3. Commit main's own dirt first and 4. Rebase onto main, plus 2 more sections
- Calls git
What it does
Git Rebase Main is an agent skill from Dimon94/skills. Land a finished branch on local main with linear history — commit pending work, commit main's own dirt first, rebase onto main, fast-forward main. Use when the user asks to rebase/merge/合回主分支 into local main after work is committed. Local only, never touches remotes.
Its SKILL.md is about 380 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.
It sits in Development, covering Git workflow. It works with Git. The repository describes itself as: 个人 agent skill 库 — skills/ 为唯一真相源，agent 目录经 symlink 消费.
When your agent uses it
- The user asks to rebase/merge/合回主分支 into local main after work is committed
- Tasks that involve Git workflow
Example prompts
- “/git-rebase-main”
Workflow steps
6 steps, taken from the step headings in SKILL.md.
- Commit pending work here
- Already on main → done
- Commit main's own dirt first
- Rebase onto main
- Advance main to the rebased head
- Report
What it can do on your machine
Read from SKILL.md and the folder at commit 9e8d3b3. 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
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
Git Rebase Main loads about 377 tokens when it runs. Until then it costs about 71 tokens; SKILL.md has 189 words of instructions outside code blocks.
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); files beside SKILL.md are not scanned.
SKILL.md
Without a licence we can't republish the file, so here is its outline and opening line. It has 189 words (~377 tokens).
“Land the current branch on local main with linear history. Local only: never push, never fetch, never delete the branch afterward.”
- name
- git-rebase-main
Files
Just SKILL.md in skills/git-rebase-main of Dimon94/skills.
Open the folder on GitHubat commit 9e8d3b3
Compare with similar skills
Git Rebase Main 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.
| Skill | Stars | Used in | Tokens | Auto-check | Licence | Repo updated |
|---|---|---|---|---|---|---|
| Git Rebase Main this skillDimon94/skills | 107 | — | ~377 | Automated safety check: Pass | None | |
| Finishing a Development Branchobra/superpowers | 296k | 5 repos | ~1.9k | Automated safety check: Pass | MIT | |
| Code Design Rationale Investigatorcursor/plugins | 10k | 9 repos | ~2.6k | Automated safety check: Pass | None | |
| Contributor-First PR MergeHKUDS/OpenHarness | 16k | 1 repos | ~847 | Automated safety check: Pass | MIT | |
| Migrate Internal Package into GhostTryGhost/Ghost | 55k | — | ~3.8k | Automated safety check: Pass | MIT | |
| Create Pull Requestcline/cline | 70k | 1 repos | ~1.6k | Automated safety check: Pass | Apache-2.0 |
Similar skills
- Official
Code Design Rationale Investigator
cursor/plugins
Digs into why code is shaped the way it is by checking git history, pull requests and connected tools in parallel, then reporting a cited read on the tradeoffs.
Contributor-First PR Merge
HKUDS/OpenHarness
Merges external GitHub pull requests while keeping the original author credited, and fixes conflicts after the merge instead of rewriting the contribution.
Migrate Internal Package into Ghost
TryGhost/Ghost
Moves a package from another TryGhost repository into Ghost as an internal workspace package while keeping its Git history, with checkpoints for the steps that need an administrator.
Create Pull Request
cline/cline
Opens a GitHub pull request from your current branch with the gh CLI, after reviewing the commits and diff and gathering the details the PR needs.
Git Merge Conflict Resolver
tailcallhq/forgecode
Resolves Git merge conflicts with a plan-first workflow that keeps both sides' intent, regenerates lock files and backs up deleted-but-modified files.
More from Dimon94/skills
All 9 skills in this repoDo Not Repeat Yourself
Dimon94/skills
Find and reuse the nearest correct mechanism before adding another.
Productionize App With Services
Dimon94/skills
Productize a working prototype by adding a bounded set of explicitly requested operational or product services.
Sync Upstream Skills
Dimon94/skills
检查或更新本仓精选的第三方套件 Skill 快照。用于核对上游变化、刷新快照或处理同步漂移；只读检查可直接运行，写入更新必须由用户明确要求。
Gh Merge PR
Dimon94/skills
审查并在独立授权后合并一个 GitHub PR。用于单 PR 的 current-head SubAgent Review、按证据调用专项 Review、落地与 parity readback；裸分支或缺失 PR 转交 git-push-pr。
Git Push PR
Dimon94/skills
Push a verified branch and create or update exactly one GitHub pull request.
Git Commit
Dimon94/skills
Create narrow auditable local commits. An agent skill from Dimon94/skills.
Related
Works with
Categories
Questions about Git Rebase Main
What does Git Rebase Main do?
Land a finished branch on local main with linear history — commit pending work, commit main's own dirt first, rebase onto main, fast-forward main. Git Rebase Main is an agent skill from Dimon94/skills. Land a finished branch on local main with linear history — commit pending work, commit main's own dirt first, rebase onto main, fast-forward main.
When should I use Git Rebase Main?
Git Rebase Main fits situations like: the user asks to rebase/merge/合回主分支 into local main after work is committed; tasks that involve Git workflow.
How do I install Git Rebase Main in Claude Code?
Run `npx skills add Dimon94/skills --skill git-rebase-main -a claude-code`. Or copy the skill folder (skills/git-rebase-main in Dimon94/skills) into .claude/skills/git-rebase-main in your project. Claude Code loads it when a task matches its description.
How do I install Git Rebase Main in Codex?
Run `npx skills add Dimon94/skills --skill git-rebase-main -a codex`. Or copy the skill folder (skills/git-rebase-main in Dimon94/skills) into .agents/skills/git-rebase-main in your project. Codex loads it when a task matches its description.
Can I use Git Rebase Main 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 Dimon94/skills --skill git-rebase-main -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/git-rebase-main, .gemini/skills/git-rebase-main, .github/skills/git-rebase-main and .opencode/skills/git-rebase-main in your project.
What does Git Rebase Main need to run?
Going by SKILL.md and its folder, Git Rebase Main needs the command-line tools its instructions call (git).
Does Git Rebase Main 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 Git Rebase Main 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. Review the folder before installing.
What licence does Git Rebase Main use?
No licence was found for Git Rebase Main or its repository. Without one, default copyright applies: ask the author before reusing or redistributing it.
How many tokens does Git Rebase Main use?
About 377 tokens (SKILL.md is roughly 1.5k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.
What are the alternatives to Git Rebase Main?
Skills that share tags, products or a category with Git Rebase Main: Finishing a Development Branch (obra/superpowers, 296k stars), Code Design Rationale Investigator (cursor/plugins, 10k stars), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars) and Migrate Internal Package into Ghost (TryGhost/Ghost, 55k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
Who maintains Git Rebase Main?
Dimon94 (a GitHub user) maintains it in Dimon94/skills, which has 107 GitHub stars. The repository holds 9 skills in this directory. The repository was last updated on September 30, 2026.
Source: Dimon94/skills on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.