Agent skill

Rebase

by mikotoIO in mikotoIO/mikoto

Rebases the current branch onto the latest main branch. An agent skill from mikotoIO/mikoto.

MITAuto-check passedDevelopment

Install Rebase

skills CLI
$ npx skills add mikotoIO/mikoto --skill rebase -a claude-code

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

GitHub CLI
$ gh skill install mikotoIO/mikoto rebase --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/mikotoIO/mikoto.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.claude/skills/rebase .claude/skills/rebase && 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
GitHub stars
132
Token cost
~290 tokens
SKILL.md length
157 words
Files
1
Skills in repo
6
Repo updated
First seen
Licence
MIT

At a glance

Rebases the current branch onto the latest main branch. An agent skill from mikotoIO/mikoto.

  • Works in 3 steps: Fetch the latest changes from origin. → Rebase the current branch onto… → If there are conflicts, resolve…
  • Tasks that involve Git workflow
  • Calls git

What it does

Rebase is an agent skill from mikotoIO/mikoto. Rebases the current branch onto the latest main branch.

Its SKILL.md is about 290 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 MIT.

When your agent uses it

  • Tasks that involve Git workflow

Example prompts

  • “Use the rebase skill to rebase the current branch onto the latest main branch. An agent skill from mikotoIO/mikoto”
  • “/rebase”

Workflow steps

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

  1. Fetch the latest changes from origin.
  2. Rebase the current branch onto origin/main.
  3. If there are conflicts, resolve conflicts automatically, trying to preserve features from both branches.

What it can do on your machine

Read from SKILL.md and the folder at commit 88f7ff0. 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 loads about 290 tokens when it runs. Until then it costs about 16 tokens; SKILL.md has 157 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~16
When it runs · the whole SKILL.md, loaded when a task matches
~290

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 mikotoIO/mikoto at commit 88f7ff0, republished under its MIT licence (© mikotoIO). 157 words, ~290 tokens.

Download SKILL.mdSave it as .claude/skills/rebase/SKILL.md (or your agent's skills folder).
name
rebase
description
Rebases the current branch onto the latest main branch.

Steps:

  1. Fetch the latest changes from origin.
  2. Rebase the current branch onto origin/main.
  3. If there are conflicts, resolve conflicts automatically, trying to preserve features from both branches.

Conflict resolution

If no conflicts: Report success — how many commits were replayed, new HEAD.

If conflicts occur, handle each one:

  1. Run git diff --name-only --diff-filter=U to list conflicted files.
  2. For each conflicted file, read the file and examine the conflict markers.
  3. Attempt trivial resolution: if one side is clearly a superset (the other side made no changes in that region), resolve automatically.
  4. For genuine conflicts, show the user both sides with surrounding context using AskUserQuestion. Offer:
    • Keep ours — accept the current branch's version
    • Keep theirs — accept the upstream version
    • Abort rebase — run git rebase --abort and stop
  5. After resolving all files in the current step: git add <files> and git rebase --continue.
  6. Repeat until the rebase completes or the user aborts.

© mikotoIO, MIT. 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 of mikotoIO/mikoto.

Open the folder on GitHubat commit 88f7ff0

Compare with similar skills

Rebase 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 compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Rebase this skillmikotoIO/mikoto132—~290Automated safety check: PassMIT
Finishing a Development Branchobra/superpowers297k5 repos~1.9kAutomated safety check: PassMIT
Code Design Rationale Investigatorcursor/plugins11k9 repos~2.6kAutomated safety check: PassNone
Contributor-First PR MergeHKUDS/OpenHarness16k1 repos~847Automated safety check: PassMIT
Migrate Internal Package into GhostTryGhost/Ghost56k—~3.8kAutomated safety check: PassMIT
Create Pull Requestcline/cline70k1 repos~1.6kAutomated safety check: PassApache-2.0

Similar skills

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

    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.

    11k GitHub starsUsed in 9 repos~2.6k tokens
    DevelopmentAuto-check passed
  • 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
  • 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.

    56k GitHub stars~3.8k tokensUpdated today
    DevelopmentAuto-check passed
  • 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 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.

    7.6k GitHub starsUsed in 1 repo~4.5k tokens
    DevelopmentAuto-check passed

More from mikotoIO/mikoto

  • Chakra UI

    mikotoIO/mikoto

    Contains Chakra UI v3 documentation for styling, theming, and components.

    132 GitHub stars~824 tokensUpdated 2 mo ago
    Auto-check passed
  • Learn

    mikotoIO/mikoto

    Creates a new skill or updates an existing skill to capture new knowledge.

    132 GitHub stars~517 tokensUpdated 2 mo ago
    Auto-check passed
  • Rust

    mikotoIO/mikoto

    Contains knowledge on Mikoto usage of Rust. An agent skill from mikotoIO/mikoto.

    132 GitHub stars~2.7k tokensUpdated 2 mo ago
    Auto-check passed
  • Typescript React

    mikotoIO/mikoto

    Contains TypeScript/React patterns and conventions for the Mikoto frontend.

    132 GitHub stars~2.5k tokensUpdated 2 mo ago
    Auto-check passed
  • Create PR

    mikotoIO/mikoto

    Creates a pull request using the GitHub CLI. An agent skill from mikotoIO/mikoto.

    132 GitHub stars~138 tokensUpdated 2 mo ago
    Auto-check passed

Works with

Categories

Questions about Rebase

What does Rebase do?

Rebases the current branch onto the latest main branch. An agent skill from mikotoIO/mikoto. Rebase is an agent skill from mikotoIO/mikoto. Rebases the current branch onto the latest main branch.

When should I use Rebase?

Rebase fits situations like: tasks that involve Git workflow.

How do I install Rebase in Claude Code?

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

How do I install Rebase in Codex?

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

Can I use Rebase 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 mikotoIO/mikoto --skill rebase -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, .gemini/skills/rebase, .github/skills/rebase and .opencode/skills/rebase in your project.

What does Rebase need to run?

Going by SKILL.md and its folder, Rebase needs the command-line tools its instructions call (git).

Does Rebase 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 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 use?

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

How many tokens does Rebase use?

About 290 tokens (SKILL.md is roughly 1.2k 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?

Skills that share tags, products or a category with Rebase: 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?

mikotoIO (a GitHub organization) maintains it in mikotoIO/mikoto, which has 132 GitHub stars. The repository holds 6 skills in this directory. The repository was last updated on August 5, 2026.

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