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

Rebase Autosquash

by shopsys in shopsys/shopsys

Rebase a branch onto the latest base branch and apply its fixup commits (git rebase --autosquash), resolving conflicts semantically along the way.

Custom licenceAuto-check passedDevelopment

Install Rebase Autosquash

skills CLI
$ npx skills add shopsys/shopsys --skill rebase-autosquash -a claude-code

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

GitHub CLI
$ gh skill install shopsys/shopsys rebase-autosquash --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/shopsys/shopsys.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/rebase-autosquash .claude/skills/rebase-autosquash && 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
rebase-autosquash
GitHub stars
350
Token cost
~1.2k tokens
SKILL.md length
535 words
Files
1
Skills in repo
38
Repo updated
First seen
Licence
Custom licence

At a glance

Rebase a branch onto the latest base branch and apply its fixup commits (git rebase --autosquash), resolving conflicts semantically along the way.

  • Blocked by fixup commits
  • SKILL.md covers Mode selection, PR mode — additions to the… and CI wrapper
  • Calls git and gh
  • Conflicts with its base

What it does

Rebase Autosquash is an agent skill from shopsys/shopsys. Rebase a branch onto the latest base branch and apply its fixup commits (git rebase --autosquash), resolving conflicts semantically along the way. Works on a pull request (rebases its head branch, force-pushes with --force-with-lease only, and posts a report comment) or on the currently checked-out local branch — then it stays local: no push, no PR comment, pushing is left to the user. Verifies the result with git range-diff. Use when a PR is stale, blocked by fixup commits, or conflicts with its base, when the…

Its SKILL.md is about 1.2k 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 and Pull requests. 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

  • Blocked by fixup commits
  • Conflicts with its base
  • The user asks to rebase and apply fixups on the current branch
  • The user invokes /rebase-autosquash

Example prompts

  • “/rebase-autosquash”

What it can do on your machine

Read from SKILL.md and the folder at commit 0514b92. 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
    • gh

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

  • Network

    No URLs in SKILL.md. Its commands use git and gh, 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.2k tokens when it runs. Until then it costs about 175 tokens; SKILL.md has 535 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~175
When it runs · the whole SKILL.md, loaded when a task matches
~1.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); 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 535 words (~1,197 tokens).

“The rebase itself — autosquash, conflict resolution, range-diff verification — is authored from the project perspective as a pure-git flow. Read the canonical:”

— opening of SKILL.md by shopsys, Custom licence
name
rebase-autosquash
user_invocable
true
disable-model-invocation
true
version
1.1.0

Read the full SKILL.md on GitHub

Files

Just SKILL.md in .agents/skills/rebase-autosquash of shopsys/shopsys.

Open the folder on GitHubat commit 0514b92

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.

Rebase Autosquash compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Rebase Autosquash this skillshopsys/shopsys350—~1.2kAutomated safety check: PassCustom licence
Finishing a Development Branchobra/superpowers297k5 repos~1.9kAutomated safety check: PassMIT
Contributor-First PR MergeHKUDS/OpenHarness16k1 repos~847Automated safety check: PassMIT
Create Pull Requestcline/cline70k1 repos~1.6kAutomated safety check: PassApache-2.0
Git Branch Namingmakeplane/plane61k—~594Automated safety check: PassAGPL-3.0
Creating Description For Gh PRredis/jedis12k—~838Automated safety check: PassMIT

Similar skills

  • 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

  • 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.

    16k GitHub starsUsed in 1 repo~847 tokens
    DevelopmentAuto-check passed

  • 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.

    70k GitHub starsUsed in 1 repo~1.6k tokens
    DevelopmentAuto-check passed

  • Git Branch Naming

    makeplane/plane

    Names a new Git branch with a type prefix, the lowercased work item ID and a short kebab-case description, so the ID can be extracted later from the branch name.

    61k GitHub stars~594 tokensUpdated yesterday
    DevelopmentAuto-check passed

  • Creating Description For Gh PR

    redis/jedis

    Official

    Generate a clear, concise GitHub PR title and description from the diff between two local git branches, and save it to prDescription.md in the repo root.

    12k GitHub stars~838 tokensUpdated yesterday
    DevelopmentAuto-check passed

  • Create Pull Request with Work Item ID

    makeplane/plane

    Opens a pull request for the current branch using the repo's template, a work item ID in the title and a description filled in from the actual diff.

    61k GitHub stars~824 tokensUpdated yesterday
    DevelopmentAuto-check passed

More from shopsys/shopsys

All 38 skills in this repo

  • Adhoc 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…

    350 GitHub stars~2.3k tokensUpdated today
    Auto-check passed

  • 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…

    350 GitHub stars~771 tokensUpdated today
    Auto-check: notes

  • Create Enum

    shopsys/shopsys

    Create a Shopsys-style enum (a class extending AbstractEnum with public typed constants, NOT a native PHP enum).

    350 GitHub stars~1.9k tokensUpdated today
    Auto-check passed

  • Docs Researcher

    shopsys/shopsys

    Searches and analyzes documentation to provide relevant information for development tasks.

    350 GitHub stars~1.5k tokensUpdated today
    Auto-check passed

  • 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.

    350 GitHub stars~2k tokensUpdated today
    Auto-check passed

  • PR Description

    shopsys/shopsys

    Generates a PR description focused on business value using the project's PR template.

    350 GitHub stars~1.7k tokensUpdated today
    Auto-check passed

Works with

Categories

Questions about Rebase Autosquash

What does Rebase Autosquash do?

Rebase a branch onto the latest 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 a branch onto the latest 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: blocked by fixup commits; conflicts with its base; the user asks to rebase and apply fixups on the current branch; the user invokes /rebase-autosquash.

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 (.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 (.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 and gh).

Does Rebase Autosquash access the network?

SKILL.md contains no URLs. Its commands use git and gh, 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.2k tokens (SKILL.md is roughly 4.8k 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), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars), Create Pull Request (cline/cline, 70k stars) and Git Branch Naming (makeplane/plane, 61k 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.