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 the currently checked-out branch onto the latest tip of its base branch and apply its fixup commits (git rebase --autosquash), resolving conflicts semantically along the way.
Install Rebase Autosquash
$ npx skills add shopsys/shopsys --skill rebase-autosquash -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install shopsys/shopsys rebase-autosquash --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/shopsys/shopsys.git skills-src && mkdir -p .claude/skills && cp -r skills-src/project-base/.agents/skills/rebase-autosquash .claude/skills/rebase-autosquash && 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-autosquash" agent skill from https://github.com/shopsys/shopsys/tree/20.0/project-base/.agents/skills/rebase-autosquash into .claude/skills/rebase-autosquash/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-autosquash", 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/shopsys/shopsys/tree/20.0/project-base/.agents/skills/rebase-autosquashType 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 shopsys/shopsys --skill rebase-autosquash -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install shopsys/shopsys rebase-autosquash --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/shopsys/shopsys.git skills-src && mkdir -p .agents/skills && cp -r skills-src/project-base/.agents/skills/rebase-autosquash .agents/skills/rebase-autosquash && 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-autosquash" agent skill from https://github.com/shopsys/shopsys/tree/20.0/project-base/.agents/skills/rebase-autosquash into .agents/skills/rebase-autosquash/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-autosquash", 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 shopsys/shopsys --skill rebase-autosquash -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install shopsys/shopsys rebase-autosquash --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/shopsys/shopsys.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/project-base/.agents/skills/rebase-autosquash .cursor/skills/rebase-autosquash && 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-autosquash" agent skill from https://github.com/shopsys/shopsys/tree/20.0/project-base/.agents/skills/rebase-autosquash into .cursor/skills/rebase-autosquash/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-autosquash", 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/shopsys/shopsys.git --path project-base/.agents/skills/rebase-autosquash--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 shopsys/shopsys --skill rebase-autosquash -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install shopsys/shopsys rebase-autosquash --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/shopsys/shopsys.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/project-base/.agents/skills/rebase-autosquash .gemini/skills/rebase-autosquash && 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-autosquash" agent skill from https://github.com/shopsys/shopsys/tree/20.0/project-base/.agents/skills/rebase-autosquash into .gemini/skills/rebase-autosquash/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-autosquash", 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 shopsys/shopsys rebase-autosquashInstalls 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 shopsys/shopsys --skill rebase-autosquash -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/shopsys/shopsys.git skills-src && mkdir -p .github/skills && cp -r skills-src/project-base/.agents/skills/rebase-autosquash .github/skills/rebase-autosquash && 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-autosquash" agent skill from https://github.com/shopsys/shopsys/tree/20.0/project-base/.agents/skills/rebase-autosquash into .github/skills/rebase-autosquash/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-autosquash", 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 shopsys/shopsys --skill rebase-autosquash -a opencodeOpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
$ gh skill install shopsys/shopsys rebase-autosquash --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/shopsys/shopsys.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/project-base/.agents/skills/rebase-autosquash .opencode/skills/rebase-autosquash && 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-autosquash" agent skill from https://github.com/shopsys/shopsys/tree/20.0/project-base/.agents/skills/rebase-autosquash into .opencode/skills/rebase-autosquash/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-autosquash", 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-autosquash- GitHub stars
- 350
- Token cost
- ~1.3k tokens
- SKILL.md length
- 682 words
- Files
- 1
- Skills in repo
- 38
- Repo updated
- First seen
- Licence
- Custom licence
At a glance
Rebase the currently checked-out branch onto the latest tip of its base branch and apply its fixup commits (git rebase --autosquash), resolving conflicts semantically along the way.
- Works in 6 steps: Prepare → Rebase with autosquash → Resolve conflicts → …
- The branch is stale
- SKILL.md covers Command Arguments, Base branch resolution, Preconditions — verify before… and Workflow
- Calls git
What it does
Rebase Autosquash is an agent skill from shopsys/shopsys. Rebase the currently checked-out branch onto the latest tip of its base branch and apply its fixup commits (git rebase --autosquash), resolving conflicts semantically along the way. Verifies the result with git range-diff; pushing is left to the user. Use when the branch is stale, carries fixup commits, or conflicts with its base, when the user asks to rebase and apply fixups, or when the user invokes /rebase-autosquash.
Its SKILL.md is about 1.3k 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: Main repository for maintaining Shopsys Platform packages. Open for ISSUES and PULL REQUESTS.
When your agent uses it
- The branch is stale
- Carries fixup commits
- Conflicts with its base
- The user asks to rebase and apply fixups
Example prompts
- “/rebase-autosquash”
Workflow steps
6 steps, taken from the step headings in SKILL.md.
- Prepare
- Rebase with autosquash
- Resolve conflicts
- Verify
- Pushing stays with the user
- Report
What it can do on your machine
Read from SKILL.md and the folder at commit a994ffa. 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 Autosquash loads about 1.3k tokens when it runs. Until then it costs about 111 tokens; SKILL.md has 682 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
Its licence (Custom licence) doesn't allow us to republish the file, so here is its outline and opening line. It has 682 words (~1,332 tokens).
“Brings the current branch up to date in one pass: rebases it onto the current tip of its base branch, squashes fixup!/squash!/amend! commits into their targets, and resolves conflicts. The goal is a branch that is identical in content to…”
- name
- rebase-autosquash
- user_invocable
- true
- disable-model-invocation
- true
- version
- 1.1.0
Files
Just SKILL.md in project-base/.agents/skills/rebase-autosquash of shopsys/shopsys.
Open the folder on GitHubat commit a994ffa
Compare with similar skills
Rebase Autosquash 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 Autosquash this skillshopsys/shopsys | 350 | — | ~1.3k | Automated safety check: Pass | Custom licence | |
| Finishing a Development Branchobra/superpowers | 297k | 5 repos | ~1.9k | Automated safety check: Pass | MIT | |
| Code Design Rationale Investigatorcursor/plugins | 11k | 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 | 56k | — | ~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 shopsys/shopsys
All 38 skills in this repoAdhoc PR
shopsys/shopsys
Ad-hoc Pull Request Publisher — commits the current changes, pushes the branch, opens a GitHub pull request against the repository's default branch, and creates a matching SSP Jira issue in the…
Commit
shopsys/shopsys
Interactive commit workflow — analyzes all uncommitted changes, proposes atomic, logically grouped commits with messages following commit-conventions, and executes them only after the user approves…
Create Enum
shopsys/shopsys
Create a Shopsys-style enum (a class extending AbstractEnum with public typed constants, NOT a native PHP enum).
Docs Researcher
shopsys/shopsys
Searches and analyzes documentation to provide relevant information for development tasks.
PR Comments
shopsys/shopsys
Work with GitHub PR review threads — list unresolved comments as a digest (who is waiting on whom), reply to threads, and resolve/unresolve them.
PR Description
shopsys/shopsys
Generates a PR description focused on business value using the project's PR template.
Related
Works with
Categories
Questions about Rebase Autosquash
What does Rebase Autosquash do?
Rebase the currently checked-out branch onto the latest tip of its base branch and apply its fixup commits (git rebase --autosquash), resolving conflicts semantically along the way. Rebase Autosquash is an agent skill from shopsys/shopsys. Rebase the currently checked-out branch onto the latest tip of its base branch and apply its fixup commits (git rebase --autosquash), resolving conflicts semantically along the way.
When should I use Rebase Autosquash?
Rebase Autosquash fits situations like: the branch is stale; carries fixup commits; conflicts with its base; the user asks to rebase and apply fixups.
How do I install Rebase Autosquash in Claude Code?
Run `npx skills add shopsys/shopsys --skill rebase-autosquash -a claude-code`. Or copy the skill folder (project-base/.agents/skills/rebase-autosquash in shopsys/shopsys) into .claude/skills/rebase-autosquash in your project. Claude Code loads it when a task matches its description.
How do I install Rebase Autosquash in Codex?
Run `npx skills add shopsys/shopsys --skill rebase-autosquash -a codex`. Or copy the skill folder (project-base/.agents/skills/rebase-autosquash in shopsys/shopsys) into .agents/skills/rebase-autosquash in your project. Codex loads it when a task matches its description.
Can I use Rebase Autosquash 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 shopsys/shopsys --skill rebase-autosquash -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-autosquash, .gemini/skills/rebase-autosquash, .github/skills/rebase-autosquash and .opencode/skills/rebase-autosquash in your project.
What does Rebase Autosquash need to run?
Going by SKILL.md and its folder, Rebase Autosquash needs the command-line tools its instructions call (git).
Does Rebase Autosquash 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 Autosquash 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 Autosquash use?
Rebase Autosquash has a licence file (the repository's licence) that doesn't match a standard licence. Read it on GitHub before reusing the skill.
How many tokens does Rebase Autosquash use?
About 1.3k tokens (SKILL.md is roughly 5.3k 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 Autosquash?
Skills that share tags, products or a category with Rebase Autosquash: Finishing a Development Branch (obra/superpowers, 297k stars), Code Design Rationale Investigator (cursor/plugins, 11k stars), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars) and Migrate Internal Package into Ghost (TryGhost/Ghost, 56k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
Who maintains Rebase Autosquash?
shopsys (a GitHub organization) maintains it in shopsys/shopsys, which has 350 GitHub stars. The repository holds 38 skills in this directory. The repository was last updated on October 9, 2026.
Source: shopsys/shopsys on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.