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 branches and resolve cross-commit conflicts while preserving changes.
Install Git Rebase
$ npx skills add pedronauck/skills --skill git-rebase -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install pedronauck/skills git-rebase --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/pedronauck/skills.git skills-src && mkdir -p .claude/skills && cp -r skills-src/skills/mine/git-rebase .claude/skills/git-rebase && 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 "git-rebase" agent skill from https://github.com/pedronauck/skills/tree/main/skills/mine/git-rebase into .claude/skills/git-rebase/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-rebase", 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/pedronauck/skills/tree/main/skills/mine/git-rebaseType 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 pedronauck/skills --skill git-rebase -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install pedronauck/skills git-rebase --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/pedronauck/skills.git skills-src && mkdir -p .agents/skills && cp -r skills-src/skills/mine/git-rebase .agents/skills/git-rebase && rm -rf skills-srcUse ~/.agents/skills/ instead of .agents/skills for a personal install.
Codex skills documentation · loads skills from .agents/skills/
Install the "git-rebase" agent skill from https://github.com/pedronauck/skills/tree/main/skills/mine/git-rebase into .agents/skills/git-rebase/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-rebase", 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 pedronauck/skills --skill git-rebase -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install pedronauck/skills git-rebase --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/pedronauck/skills.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/skills/mine/git-rebase .cursor/skills/git-rebase && 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 "git-rebase" agent skill from https://github.com/pedronauck/skills/tree/main/skills/mine/git-rebase into .cursor/skills/git-rebase/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-rebase", 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/pedronauck/skills.git --path skills/mine/git-rebase--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 pedronauck/skills --skill git-rebase -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install pedronauck/skills git-rebase --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/pedronauck/skills.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/skills/mine/git-rebase .gemini/skills/git-rebase && 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 "git-rebase" agent skill from https://github.com/pedronauck/skills/tree/main/skills/mine/git-rebase into .gemini/skills/git-rebase/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-rebase", 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 pedronauck/skills git-rebaseInstalls 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 pedronauck/skills --skill git-rebase -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/pedronauck/skills.git skills-src && mkdir -p .github/skills && cp -r skills-src/skills/mine/git-rebase .github/skills/git-rebase && 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 "git-rebase" agent skill from https://github.com/pedronauck/skills/tree/main/skills/mine/git-rebase into .github/skills/git-rebase/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-rebase", 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 pedronauck/skills --skill git-rebase -a opencodeOpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
$ gh skill install pedronauck/skills git-rebase --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/pedronauck/skills.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/skills/mine/git-rebase .opencode/skills/git-rebase && 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 "git-rebase" agent skill from https://github.com/pedronauck/skills/tree/main/skills/mine/git-rebase into .opencode/skills/git-rebase/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-rebase", 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
git-rebase- GitHub stars
- 634
- Used in
- 1 other repo
- Token cost
- ~707 tokens
- SKILL.md length
- 353 words
- Files
- 9 (incl. scripts, references)
- Skills in repo
- 65
- Repo updated
- First seen
- Licence
- None found
At a glance
Rebase branches and resolve cross-commit conflicts while preserving changes.
- Works in 7 steps: Inspect status, current branch, target,… → Before starting a new rebase, record… → Rebase onto the requested target… → …
- Development work in your project
- Runs Shell scripts from its folder; calls bash
What it does
Git Rebase is an agent skill from pedronauck/skills. Rebase branches and resolve cross-commit conflicts while preserving changes. Excludes merge-commit workflows, cherry-picking, and repository setup.
Its SKILL.md is about 710 tokens, which your agent loads only when the skill is triggered. The skill folder holds 10 other files, including scripts and reference files (for example `references/automation.md`, `references/resolution-patterns.md` and `references/scripts-tools.md`).
It sits in Development. It works with Git. The repository describes itself as: My personal favorite skills.
When your agent uses it
- Development work in your project
Example prompts
- “/git-rebase”
Requirements
- A Bash shell
Workflow steps
7 steps, taken from the first numbered list in SKILL.md.
- Inspect status, current branch, target, and any in-progress rebase. Reuse a known target and current fetch evidence. Preserve dirty work…
- Before starting a new rebase, record HEAD and keep a backup ref when rewriting valuable history. bash /scripts/pre-rebase-backup.sh…
- Rebase onto the requested target directly by default. Use interactive/squash/reorder operations only when the user requested that history…
- When conflicts occur, inspect the replayed commit, base, and both sides. During rebase, ours is the target plus commits already replayed…
- Resolve the affected files, inspect their diff, stage only those resolved paths, then continue. Reuse valid observations for repeated…
- At the completed rebase, inspect the resulting patch series/diff and run checks for affected behavior plus the project's required delivery…
- Publish only when already authorized. Use --force-with-lease for a rewritten remote branch, and follow the project's current-head CI…
What it can do on your machine
Read from SKILL.md and the folder at commit 0422940. 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
Ships 3 files in scripts/ (Shell), which the agent can run.
Shell commands in SKILL.md call:
bash
From the folder's file list and the shell code blocks in SKILL.md.
Network
No URLs in SKILL.md.
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
Git Rebase loads about 707 tokens when it runs, and up to ~2.1k if it reads all its reference files. Until then it costs about 40 tokens; SKILL.md has 353 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); the scripts in this folder are not scanned.
SKILL.md
Without a licence we can't republish the file, so here is its outline and opening line. It has 353 words (~707 tokens).
“Carry out the requested rebase while preserving both sides' intended behavior and unrelated work. A rebase request does not by itself authorize squashing, dropping commits, changing global Git settings, or publishing a rewritten branch.”
- name
- git-rebase
- metadata.author
- Pedro Nauck
- metadata.github
- https://github.com/pedronauck
- metadata.repository
- https://github.com/pedronauck/skills
Files
SKILL.md and 8 other files (scripts, references) in skills/mine/git-rebase of pedronauck/skills.
- SKILL.md
- references/automation.md
- references/resolution-patterns.md
- references/scripts-tools.md
- references/strategies.md
- references/troubleshooting.md
- scripts/analyze-conflicts.sh
- scripts/pre-rebase-backup.sh
- scripts/validate-merge.sh
Open the folder on GitHubat commit 0422940
Used in 2 other repositories
We found 3 copies of this SKILL.md (exact, near-identical or edited) in other folders, from 1 other GitHub owner. This page covers the copy in pedronauck/skills, which our catalogue first saw on October 7, 2026.
Compare with similar skills
Git 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.
| Skill | Stars | Used in | Tokens | Auto-check | Licence | Repo updated |
|---|---|---|---|---|---|---|
| Git Rebase this skillpedronauck/skills | 634 | 1 repos | ~707 | Automated safety check: Pass | None | |
| Finishing a Development Branchobra/superpowers | 296k | 5 repos | ~1.9k | Automated safety check: Pass | MIT | |
| Code Review ChecklistshareAI-lab/learn-claude-code | 78k | 5 repos | ~1.1k | Automated safety check: Pass | MIT | |
| Codebase Knowledge Graph Q&AEgonex-AI/Understand-Anything | 86k | 1 repos | ~1.2k | Automated safety check: Pass | MIT | |
| Code Design Rationale Investigatorcursor/plugins | 10k | 9 repos | ~2.6k | Automated safety check: Pass | None | |
| Understand Diff AnalysisEgonex-AI/Understand-Anything | 86k | 1 repos | ~1.4k | Automated safety check: Pass | MIT |
Similar skills
Code Review Checklist
shareAI-lab/learn-claude-code
Reviews code against a five-part checklist covering security, correctness, performance, maintainability and testing, and reports findings in a fixed format.
Codebase Knowledge Graph Q&A
Egonex-AI/Understand-Anything
Answers questions about a codebase by searching a prebuilt knowledge graph of its files, functions, classes and dependencies, not by rereading every source file.
- 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.
Understand Diff Analysis
Egonex-AI/Understand-Anything
Reads your git changes or a pull request against a prebuilt knowledge graph of the project to explain what changed, which components are affected and what is risky.
Understand Explain
Egonex-AI/Understand-Anything
Gives an in-depth explanation of one file, function or module by reading the project's knowledge graph and checking that the graph is still fresh.
More from pedronauck/skills
All 65 skills in this repoDeep Review
pedronauck/skills
Review branch diffs, working trees, or PRs in depth with defect, polish and cross-contract coverage.
Yc Apply
pedronauck/skills
Prepare, review, and package Y Combinator application answers and founder-video notes using the live form and verified founder facts.
Professional Communication
pedronauck/skills
Guide technical communication for software developers. An agent skill from pedronauck/skills.
Tauri V2
pedronauck/skills
Tauri v2+ cross-platform app development with Rust backend. An agent skill from pedronauck/skills.
Hormozi Ad Factory
pedronauck/skills
Generates 150-750+ ad variations using Alex Hormozi's combinatorial Hook x Meat x CTA framework.
Yt Master
pedronauck/skills
Plans and improves YouTube ideas, titles, thumbnail concepts, scripts, retention, channel strategy, and metric-based diagnosis.
Related
Works with
Categories
Questions about Git Rebase
What does Git Rebase do?
Rebase branches and resolve cross-commit conflicts while preserving changes. Git Rebase is an agent skill from pedronauck/skills. Rebase branches and resolve cross-commit conflicts while preserving changes.
When should I use Git Rebase?
Git Rebase fits situations like: development work in your project.
How do I install Git Rebase in Claude Code?
Run `npx skills add pedronauck/skills --skill git-rebase -a claude-code`. Or copy the skill folder (skills/mine/git-rebase in pedronauck/skills) into .claude/skills/git-rebase in your project. Claude Code loads it when a task matches its description.
How do I install Git Rebase in Codex?
Run `npx skills add pedronauck/skills --skill git-rebase -a codex`. Or copy the skill folder (skills/mine/git-rebase in pedronauck/skills) into .agents/skills/git-rebase in your project. Codex loads it when a task matches its description.
Can I use Git 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 pedronauck/skills --skill git-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/git-rebase, .gemini/skills/git-rebase, .github/skills/git-rebase and .opencode/skills/git-rebase in your project.
What does Git Rebase need to run?
Going by SKILL.md and its folder, Git Rebase needs a shell for the scripts in its folder and the command-line tools its instructions call (bash). Our summary lists: A Bash shell.
Does Git Rebase access the network?
SKILL.md contains no URLs. Any network use would come from the scripts or tools the agent runs. This is read from the text; nothing was executed.
Is Git 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. The check reads SKILL.md only: the scripts in the folder are not scanned, so read them before running anything.
What licence does Git Rebase use?
No licence was found for Git Rebase or its repository. Without one, default copyright applies: ask the author before reusing or redistributing it.
How many tokens does Git Rebase use?
About 707 tokens (SKILL.md is roughly 2.8k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full. Its references folder adds about 1.4k tokens, read only when the agent opens those files.
What are the alternatives to Git Rebase?
Skills that share tags, products or a category with Git Rebase: Finishing a Development Branch (obra/superpowers, 296k stars), Code Review Checklist (shareAI-lab/learn-claude-code, 78k stars), Codebase Knowledge Graph Q&A (Egonex-AI/Understand-Anything, 86k stars) and Code Design Rationale Investigator (cursor/plugins, 10k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
Who maintains Git Rebase?
pedronauck (a GitHub user) maintains it in pedronauck/skills, which has 634 GitHub stars. The repository holds 65 skills in this directory. The repository was last updated on September 14, 2026.
Source: pedronauck/skills on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.