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.
Rebase all non-pushed commits and uncommitted changes into clean logical feature commits.
Install Rebase Commit
$ npx skills add jvm-skills/jvm-skills --skill rebase-commit -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install jvm-skills/jvm-skills rebase-commit --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/jvm-skills/jvm-skills.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.claude/skills/rebase-commit .claude/skills/rebase-commit && 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 "rebase-commit" agent skill from https://github.com/jvm-skills/jvm-skills/tree/main/.claude/skills/rebase-commit into .claude/skills/rebase-commit/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-commit", 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/jvm-skills/jvm-skills/tree/main/.claude/skills/rebase-commitType 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 jvm-skills/jvm-skills --skill rebase-commit -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install jvm-skills/jvm-skills rebase-commit --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/jvm-skills/jvm-skills.git skills-src && mkdir -p .agents/skills && cp -r skills-src/.claude/skills/rebase-commit .agents/skills/rebase-commit && rm -rf skills-srcUse ~/.agents/skills/ instead of .agents/skills for a personal install.
Codex skills documentation · loads skills from .agents/skills/
Install the "rebase-commit" agent skill from https://github.com/jvm-skills/jvm-skills/tree/main/.claude/skills/rebase-commit into .agents/skills/rebase-commit/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-commit", 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 jvm-skills/jvm-skills --skill rebase-commit -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install jvm-skills/jvm-skills rebase-commit --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/jvm-skills/jvm-skills.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/.claude/skills/rebase-commit .cursor/skills/rebase-commit && 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 "rebase-commit" agent skill from https://github.com/jvm-skills/jvm-skills/tree/main/.claude/skills/rebase-commit into .cursor/skills/rebase-commit/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-commit", 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/jvm-skills/jvm-skills.git --path .claude/skills/rebase-commit--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 jvm-skills/jvm-skills --skill rebase-commit -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install jvm-skills/jvm-skills rebase-commit --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/jvm-skills/jvm-skills.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/.claude/skills/rebase-commit .gemini/skills/rebase-commit && 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 "rebase-commit" agent skill from https://github.com/jvm-skills/jvm-skills/tree/main/.claude/skills/rebase-commit into .gemini/skills/rebase-commit/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-commit", 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 jvm-skills/jvm-skills rebase-commitInstalls 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 jvm-skills/jvm-skills --skill rebase-commit -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/jvm-skills/jvm-skills.git skills-src && mkdir -p .github/skills && cp -r skills-src/.claude/skills/rebase-commit .github/skills/rebase-commit && 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 "rebase-commit" agent skill from https://github.com/jvm-skills/jvm-skills/tree/main/.claude/skills/rebase-commit into .github/skills/rebase-commit/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-commit", 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 jvm-skills/jvm-skills --skill rebase-commit -a opencodeOpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
$ gh skill install jvm-skills/jvm-skills rebase-commit --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/jvm-skills/jvm-skills.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/.claude/skills/rebase-commit .opencode/skills/rebase-commit && 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 "rebase-commit" agent skill from https://github.com/jvm-skills/jvm-skills/tree/main/.claude/skills/rebase-commit into .opencode/skills/rebase-commit/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-commit", 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
rebase-commit- GitHub stars
- 140
- Token cost
- ~603 tokens
- SKILL.md length
- 319 words
- Files
- 1
- Skills in repo
- 16
- Repo updated
- First seen
- Licence
- Apache-2.0
At a glance
Rebase all non-pushed commits and uncommitted changes into clean logical feature commits.
- Works in 10 steps: Run git status and git diff (staged +… → Find the remote tracking branch and list… → Read the diffs of all non-pushed… → …
- Tasks that involve Git workflow
- SKILL.md covers Steps and Project Customization
- Calls git
What it does
Rebase Commit is an agent skill from jvm-skills/jvm-skills. Rebase all non-pushed commits and uncommitted changes into clean logical feature commits.
Its SKILL.md is about 600 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 licence is Apache-2.0.
When your agent uses it
- Tasks that involve Git workflow
Example prompts
- “/rebase-commit”
Workflow steps
10 steps, taken from the first numbered list in SKILL.md.
- Run git status and git diff (staged + unstaged) to understand uncommitted changes
- Find the remote tracking branch and list non-pushed commits
- Read the diffs of all non-pushed commits: git diff ..HEAD
- Combine non-pushed commits + uncommitted changes: analyze all changes and group by logical feature/intent.
- git reset --soft to unstage everything back to the last pushed state
- Stage any previously uncommitted files too (git add relevant files)
- For each logical group, stage only the files belonging to that group and commit using a HEREDOC with a concise, action-oriented message…
- Repeat step 7 until all changes are committed
- Run git log @{upstream}..HEAD --oneline (or ..HEAD) to show final commit list
- Report the resulting commits
What it can do on your machine
Read from SKILL.md and the folder at commit c6d477f. 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
Rebase Commit loads about 603 tokens when it runs. Until then it costs about 26 tokens; SKILL.md has 319 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
The full file from jvm-skills/jvm-skills at commit c6d477f, republished under its Apache-2.0 licence (© jvm-skills). 319 words, ~603 tokens.
Download SKILL.mdSave it as
.claude/skills/rebase-commit/SKILL.md (or your agent's skills folder).- name
- rebase-commit
- description
- Rebase all non-pushed commits and uncommitted changes into clean logical feature commits.
Rebase Commit Skill
Rebase all non-pushed commits and uncommitted changes into clean logical feature commits.
Steps
- Run
git statusandgit diff(staged + unstaged) to understand uncommitted changes - Find the remote tracking branch and list non-pushed commits:
git log @{upstream}..HEAD --oneline(if no upstream, fall back to the default branch — checkreferences/project.mdfor the base branch name; defaults toorigin/main) - Read the diffs of all non-pushed commits:
git diff <last-pushed-commit>..HEAD - Combine non-pushed commits + uncommitted changes: analyze all changes and group by logical feature/intent.
Vertical-slice rule: preserve vertical slices (feature + tests in one commit). If the original commits represent incremental phases/slices of a feature (e.g. "user registration", "profile page", "settings"), keep them as separate commits — do NOT merge them into one giant feature commit. Each slice should be independently reviewable with its own tests. Only merge commits that touch the same slice (e.g. a phase commit + its bugfix later). If a bugfix commit touches multiple slices, split its hunks across the relevant slice commits using
git add -p. Infra/tooling grouping: non-feature commits (tooling, config, skills, CI) CAN be grouped by concern since they don't follow the vertical-slice pattern. git reset --soft <last-pushed-commit>to unstage everything back to the last pushed state- Stage any previously uncommitted files too (
git addrelevant files) - For each logical group, stage only the files belonging to that group and commit using a HEREDOC with a concise, action-oriented message (e.g. "Add X", "Fix Y", "Refactor Z"). No conventional commit prefixes. Append:
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> - Repeat step 7 until all changes are committed
- Run
git log @{upstream}..HEAD --oneline(or<base-branch>..HEAD) to show final commit list - Report the resulting commits
Project Customization
Read references/project.md in this skill's directory if it exists. It provides project-specific context:
- Base branch name (e.g.
main,master,stage,develop) for fallback when no upstream is set - Any other project-specific patterns
© jvm-skills, Apache-2.0. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file
Files
Just SKILL.md in .claude/skills/rebase-commit of jvm-skills/jvm-skills.
Open the folder on GitHubat commit c6d477f
Compare with similar skills
Rebase Commit 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 |
|---|---|---|---|---|---|---|
| Rebase Commit this skilljvm-skills/jvm-skills | 140 | — | ~603 | Automated safety check: Pass | Apache-2.0 | |
| 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 jvm-skills/jvm-skills
All 16 skills in this repoMutation Testing
jvm-skills/jvm-skills
Bootstrap pitest via the info.solidsoft.pitest Gradle plugin with Kotlin-sane defaults, run mutation tests scoped to changed classes, interpret surviving mutants from mutations.xml, triage…
Ralph Coverage
jvm-skills/jvm-skills
Run Ralph in coverage mode — iteratively write tests for untested classes until coverage targets are met.
Skill Scout
jvm-skills/jvm-skills
Run the skill-scout loop — scan the next batch of unscanned JVM-conference rosters for speaker-created AI skills and apply results to the CSV store via the overnight Workflow.
Spec
jvm-skills/jvm-skills
Generate a feature spec with user stories directly from conversation context and codebase exploration — no interview needed.
UI Review
jvm-skills/jvm-skills
Verify UI/UX by running Playwright tests and reviewing screenshots.
Kotest
jvm-skills/jvm-skills
Write a new Kotlin test, or modernize an existing one, using Kotest matchers and idiomatic Kotlin test style — backticked names, apply/assertSoftly blocks, and existing object mothers and helpers.
Related
Works with
Categories
Questions about Rebase Commit
What does Rebase Commit do?
Rebase all non-pushed commits and uncommitted changes into clean logical feature commits. Rebase Commit is an agent skill from jvm-skills/jvm-skills. Rebase all non-pushed commits and uncommitted changes into clean logical feature commits.
When should I use Rebase Commit?
Rebase Commit fits situations like: tasks that involve Git workflow.
How do I install Rebase Commit in Claude Code?
Run `npx skills add jvm-skills/jvm-skills --skill rebase-commit -a claude-code`. Or copy the skill folder (.claude/skills/rebase-commit in jvm-skills/jvm-skills) into .claude/skills/rebase-commit in your project. Claude Code loads it when a task matches its description.
How do I install Rebase Commit in Codex?
Run `npx skills add jvm-skills/jvm-skills --skill rebase-commit -a codex`. Or copy the skill folder (.claude/skills/rebase-commit in jvm-skills/jvm-skills) into .agents/skills/rebase-commit in your project. Codex loads it when a task matches its description.
Can I use Rebase Commit 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 jvm-skills/jvm-skills --skill rebase-commit -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/rebase-commit, .gemini/skills/rebase-commit, .github/skills/rebase-commit and .opencode/skills/rebase-commit in your project.
What does Rebase Commit need to run?
Going by SKILL.md and its folder, Rebase Commit needs the command-line tools its instructions call (git).
Does Rebase Commit 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 Rebase Commit 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 Rebase Commit use?
Rebase Commit is published under the Apache-2.0 licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.
How many tokens does Rebase Commit use?
About 603 tokens (SKILL.md is roughly 2.4k 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 Rebase Commit?
Skills that share tags, products or a category with Rebase Commit: 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 Rebase Commit?
jvm-skills (a GitHub organization) maintains it in jvm-skills/jvm-skills, which has 140 GitHub stars. The repository holds 16 skills in this directory. The repository was last updated on August 31, 2026.
Source: jvm-skills/jvm-skills on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.