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, squash, or rewrite history without losing work or breaking shared branches.
Install Rebase Safely
$ npx skills add Archive228/loopkit --skill rebase-safely -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install Archive228/loopkit rebase-safely --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/Archive228/loopkit.git skills-src && mkdir -p .claude/skills && cp -r skills-src/skills/rebase-safely .claude/skills/rebase-safely && 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-safely" agent skill from https://github.com/Archive228/loopkit/tree/main/skills/rebase-safely into .claude/skills/rebase-safely/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-safely", 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/Archive228/loopkit/tree/main/skills/rebase-safelyType 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 Archive228/loopkit --skill rebase-safely -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install Archive228/loopkit rebase-safely --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/Archive228/loopkit.git skills-src && mkdir -p .agents/skills && cp -r skills-src/skills/rebase-safely .agents/skills/rebase-safely && 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-safely" agent skill from https://github.com/Archive228/loopkit/tree/main/skills/rebase-safely into .agents/skills/rebase-safely/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-safely", 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 Archive228/loopkit --skill rebase-safely -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install Archive228/loopkit rebase-safely --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/Archive228/loopkit.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/skills/rebase-safely .cursor/skills/rebase-safely && 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-safely" agent skill from https://github.com/Archive228/loopkit/tree/main/skills/rebase-safely into .cursor/skills/rebase-safely/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-safely", 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/Archive228/loopkit.git --path skills/rebase-safely--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 Archive228/loopkit --skill rebase-safely -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install Archive228/loopkit rebase-safely --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/Archive228/loopkit.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/skills/rebase-safely .gemini/skills/rebase-safely && 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-safely" agent skill from https://github.com/Archive228/loopkit/tree/main/skills/rebase-safely into .gemini/skills/rebase-safely/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-safely", 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 Archive228/loopkit rebase-safelyInstalls 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 Archive228/loopkit --skill rebase-safely -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/Archive228/loopkit.git skills-src && mkdir -p .github/skills && cp -r skills-src/skills/rebase-safely .github/skills/rebase-safely && 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-safely" agent skill from https://github.com/Archive228/loopkit/tree/main/skills/rebase-safely into .github/skills/rebase-safely/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-safely", 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 Archive228/loopkit --skill rebase-safely -a opencodeOpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
$ gh skill install Archive228/loopkit rebase-safely --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/Archive228/loopkit.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/skills/rebase-safely .opencode/skills/rebase-safely && 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-safely" agent skill from https://github.com/Archive228/loopkit/tree/main/skills/rebase-safely into .opencode/skills/rebase-safely/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rebase-safely", 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-safely- GitHub stars
- 755
- Token cost
- ~216 tokens
- SKILL.md length
- 92 words
- Files
- 1
- Skills in repo
- 43
- Repo updated
- First seen
- Licence
- MIT
At a glance
Rebase, squash, or rewrite history without losing work or breaking shared branches.
- Works in 5 steps: Backup first — git branch backup/ before… → Rebase onto the latest base: git fetch;… → Resolve conflicts one commit at a time.… → …
- Tasks that involve Git workflow
- Calls git
What it does
Rebase Safely is an agent skill from Archive228/loopkit. Rebase, squash, or rewrite history without losing work or breaking shared branches. Use before any history rewrite.
Its SKILL.md is about 220 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: 33 battle-tested skills + minimal .claude harness for any coding agent (Claude Code, Cursor, Codex, Gemini CLI). The licence is MIT.
When your agent uses it
- Tasks that involve Git workflow
Example prompts
- “/rebase-safely”
Workflow steps
5 steps, taken from the first numbered list in SKILL.md.
- Backup first — git branch backup/ before any rewrite. Free undo.
- Rebase onto the latest base: git fetch; git rebase origin/main.
- Resolve conflicts one commit at a time. Test after the rebase, not just that it "completed".
- Never rewrite shared history — if others pulled the branch, rebasing it forces them into pain. Rewrite only your own un-pushed/un-shared…
- Push with --force-with-lease, never bare --force (lease refuses if someone else pushed).
What it can do on your machine
Read from SKILL.md and the folder at commit 5ae033e. 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 Safely loads about 216 tokens when it runs. Until then it costs about 32 tokens; SKILL.md has 92 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 Archive228/loopkit at commit 5ae033e, republished under its MIT licence (© Archive228). 92 words, ~216 tokens.
Download SKILL.mdSave it as
.claude/skills/rebase-safely/SKILL.md (or your agent's skills folder).- name
- rebase-safely
- description
- Rebase, squash, or rewrite history without losing work or breaking shared branches. Use before any history rewrite.
- when_to_use
- rebase, squash, "update my branch", interactive rebase, force-push
Rebase Safely
- Backup first —
git branch backup/<name>before any rewrite. Free undo. - Rebase onto the latest base:
git fetch; git rebase origin/main. - Resolve conflicts one commit at a time. Test after the rebase, not just that it "completed".
- Never rewrite shared history — if others pulled the branch, rebasing it forces them into pain. Rewrite only your own un-pushed/un-shared commits.
- Push with
--force-with-lease, never bare--force(lease refuses if someone else pushed). If anything goes sideways:git reflogfinds the pre-rebase state;git reset --hard backup/<name>restores it.
© Archive228, 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 skills/rebase-safely of Archive228/loopkit.
Open the folder on GitHubat commit 5ae033e
Compare with similar skills
Rebase Safely 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 Safely this skillArchive228/loopkit | 755 | — | ~216 | Automated safety check: Pass | MIT | |
| Finishing a Development Branchobra/superpowers | 297k | 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 | 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 Archive228/loopkit
All 43 skills in this repoHitl Escalate
Archive228/loopkit
Escalate blocked runs to a human via configured channel or fallback to BLOCKED.md and exit the loop.
Structured Output
Archive228/loopkit
Get JSON out of the model reliably. An agent skill from Archive228/loopkit.
Using Loopkit
Archive228/loopkit
A skill your agent uses when starting any conversation in a loopkit-enabled project - establishes how to find and use loopkit's 49 skills, requiring skill invocation before ANY response including…
Active Memory Reminder
Archive228/loopkit
Before compaction Loopkit extracts decisions into claude-decisions.json (machine-readable).
Eval Harness
Archive228/loopkit
Build a repeatable eval loop that grades agent output with an LLM judge, so prompt/skill changes get scored against a baseline instead of eyeballed.
Feature List JSON
Archive228/loopkit
Enumerate every end-to-end feature as strict JSON entries with passes:false, editable-passes-only discipline, and priority order.
Related
Works with
Categories
Questions about Rebase Safely
What does Rebase Safely do?
Rebase, squash, or rewrite history without losing work or breaking shared branches. Rebase Safely is an agent skill from Archive228/loopkit. Rebase, squash, or rewrite history without losing work or breaking shared branches.
When should I use Rebase Safely?
Rebase Safely fits situations like: tasks that involve Git workflow.
How do I install Rebase Safely in Claude Code?
Run `npx skills add Archive228/loopkit --skill rebase-safely -a claude-code`. Or copy the skill folder (skills/rebase-safely in Archive228/loopkit) into .claude/skills/rebase-safely in your project. Claude Code loads it when a task matches its description.
How do I install Rebase Safely in Codex?
Run `npx skills add Archive228/loopkit --skill rebase-safely -a codex`. Or copy the skill folder (skills/rebase-safely in Archive228/loopkit) into .agents/skills/rebase-safely in your project. Codex loads it when a task matches its description.
Can I use Rebase Safely 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 Archive228/loopkit --skill rebase-safely -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-safely, .gemini/skills/rebase-safely, .github/skills/rebase-safely and .opencode/skills/rebase-safely in your project.
What does Rebase Safely need to run?
Going by SKILL.md and its folder, Rebase Safely needs the command-line tools its instructions call (git).
Does Rebase Safely 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 Safely 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 Safely use?
Rebase Safely 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 Safely use?
About 216 tokens (SKILL.md is roughly 864 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 Safely?
Skills that share tags, products or a category with Rebase Safely: Finishing a Development Branch (obra/superpowers, 297k 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, 56k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
Who maintains Rebase Safely?
Archive228 (a GitHub user) maintains it in Archive228/loopkit, which has 755 GitHub stars. The repository holds 43 skills in this directory. The repository was last updated on July 14, 2026.
Source: Archive228/loopkit on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.