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.
Advanced Git operations and workflows including interactive rebasing, conflict resolution, history manipulation, bisecting for bugs, cherry-picking, reflog recovery, and branch management strategies.
Install Git Advanced
$ npx skills add aiskillstore/marketplace --skill git-advanced -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install aiskillstore/marketplace git-advanced --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/aiskillstore/marketplace.git skills-src && mkdir -p .claude/skills && cp -r skills-src/skills/autumnsgrove/git-advanced .claude/skills/git-advanced && 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-advanced" agent skill from https://github.com/aiskillstore/marketplace/tree/main/skills/autumnsgrove/git-advanced into .claude/skills/git-advanced/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-advanced", 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/aiskillstore/marketplace/tree/main/skills/autumnsgrove/git-advancedType 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 aiskillstore/marketplace --skill git-advanced -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install aiskillstore/marketplace git-advanced --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/aiskillstore/marketplace.git skills-src && mkdir -p .agents/skills && cp -r skills-src/skills/autumnsgrove/git-advanced .agents/skills/git-advanced && 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-advanced" agent skill from https://github.com/aiskillstore/marketplace/tree/main/skills/autumnsgrove/git-advanced into .agents/skills/git-advanced/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-advanced", 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 aiskillstore/marketplace --skill git-advanced -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install aiskillstore/marketplace git-advanced --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/aiskillstore/marketplace.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/skills/autumnsgrove/git-advanced .cursor/skills/git-advanced && 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-advanced" agent skill from https://github.com/aiskillstore/marketplace/tree/main/skills/autumnsgrove/git-advanced into .cursor/skills/git-advanced/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-advanced", 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/aiskillstore/marketplace.git --path skills/autumnsgrove/git-advanced--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 aiskillstore/marketplace --skill git-advanced -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install aiskillstore/marketplace git-advanced --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/aiskillstore/marketplace.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/skills/autumnsgrove/git-advanced .gemini/skills/git-advanced && 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-advanced" agent skill from https://github.com/aiskillstore/marketplace/tree/main/skills/autumnsgrove/git-advanced into .gemini/skills/git-advanced/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-advanced", 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 aiskillstore/marketplace git-advancedInstalls 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 aiskillstore/marketplace --skill git-advanced -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/aiskillstore/marketplace.git skills-src && mkdir -p .github/skills && cp -r skills-src/skills/autumnsgrove/git-advanced .github/skills/git-advanced && 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-advanced" agent skill from https://github.com/aiskillstore/marketplace/tree/main/skills/autumnsgrove/git-advanced into .github/skills/git-advanced/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-advanced", 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 aiskillstore/marketplace --skill git-advanced -a opencodeOpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
$ gh skill install aiskillstore/marketplace git-advanced --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/aiskillstore/marketplace.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/skills/autumnsgrove/git-advanced .opencode/skills/git-advanced && 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-advanced" agent skill from https://github.com/aiskillstore/marketplace/tree/main/skills/autumnsgrove/git-advanced into .opencode/skills/git-advanced/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-advanced", 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-advanced- GitHub stars
- 430
- Token cost
- ~2.9k tokens
- SKILL.md length
- 702 words
- Files
- 11 (incl. scripts, references)
- Skills in repo
- 1,085
- Repo updated
- First seen
- Licence
- None found
At a glance
Advanced Git operations and workflows including interactive rebasing, conflict resolution, history manipulation, bisecting for bugs, cherry-picking, reflog recovery, and branch management strategies.
- Works in 5 steps: Interactive Rebase Workflow → Conflict Resolution Workflow → Git Bisect for Bug Hunting → …
- Interactive rebasing and commit cleanup
- SKILL.md covers Overview, Core Capabilities, Quick Command Reference and Core Workflows, plus 3 more sections
- Runs Shell scripts from its folder; calls git, npm and bash
What it does
Git Advanced is an agent skill from aiskillstore/marketplace. Advanced Git operations and workflows including interactive rebasing, conflict resolution, history manipulation, bisecting for bugs, cherry-picking, reflog recovery, and branch management strategies. Use for: (1) Interactive rebasing and commit cleanup, (2) Complex merge conflict resolution, (3) Git bisect for bug hunting, (4) History rewriting and cleanup, (5) Branch strategy implementation (Git Flow, trunk-based), (6) Recovering lost commits with reflog
Its SKILL.md is about 2.9k tokens, which your agent loads only when the skill is triggered. The skill folder holds 13 other files, including scripts and reference files (for example `README.md`, `examples/branch_strategies.md` and `examples/conflict_resolution.md`).
It sits in Development, covering Git workflow. It works with Git. The repository describes itself as: Security-audited skills for Claude, Codex & Claude Code. One-click install, quality verified.
When your agent uses it
- Interactive rebasing and commit cleanup
- Complex merge conflict resolution
- Git bisect for bug hunting
- History rewriting and cleanup
Example prompts
- “/git-advanced”
Requirements
- A Bash shell
Workflow steps
5 steps, taken from the step headings in SKILL.md.
- Interactive Rebase Workflow
- Conflict Resolution Workflow
- Git Bisect for Bug Hunting
- Branch Management
- Reflog Recovery
What it can do on your machine
Read from SKILL.md and the folder at commit 4ac52da. 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 1 file in scripts/ (Shell), which the agent can run.
Shell commands in SKILL.md call:
gitnpmbash
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 npm, 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
Git Advanced loads about 2.9k tokens when it runs, and up to ~11k if it reads all its reference files. Until then it costs about 118 tokens; SKILL.md has 702 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 702 words (~2,872 tokens).
“Master advanced Git workflows for complex version control scenarios. This skill covers sophisticated operations beyond basic commits and merges, including interactive rebasing, advanced conflict resolution, history manipulation, and strategic branch management.”
- name
- git-advanced
Files
SKILL.md and 10 other files (scripts, references) in skills/autumnsgrove/git-advanced of aiskillstore/marketplace.
- SKILL.md
- README.md
- examples/branch_strategies.md
- examples/conflict_resolution.md
- examples/interactive_rebase.md
- references/best-practices.md
- references/branch-management.md
- references/reflog-recovery.md
- references/troubleshooting.md
- scripts/git_helper.sh
- skill-report.json
Open the folder on GitHubat commit 4ac52da
Compare with similar skills
Git Advanced 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 Advanced this skillaiskillstore/marketplace | 430 | — | ~2.9k | Automated safety check: Pass | None | |
| Finishing a Development Branchobra/superpowers | 296k | 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 | 55k | — | ~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 aiskillstore/marketplace
All 1,085 skills in this repoCode Stats
aiskillstore/marketplace
Analyze codebase with tokei (fast line counts by language) and difft (semantic AST-aware diffs).
Data Processing
aiskillstore/marketplace
Process JSON with jq and YAML/TOML with yq. An agent skill from aiskillstore/marketplace.
Doc Scanner
aiskillstore/marketplace
Scans for project documentation files (AGENTS.md, CLAUDE.md, GEMINI.md, COPILOT.md, CURSOR.md, WARP.md, and 15+ other formats) and synthesizes guidance.
File Search
aiskillstore/marketplace
Modern file and content search using fd, ripgrep (rg), and fzf.
Find Replace
aiskillstore/marketplace
Modern find-and-replace using sd (simpler than sed) and batch replacement patterns.
Investigating Codebases
aiskillstore/marketplace
Automatically activated when user asks how something works, wants to understand unfamiliar code, needs to explore a new codebase, or asks questions like "where is X implemented?", "how does Y…
Related
Works with
Categories
Questions about Git Advanced
What does Git Advanced do?
Advanced Git operations and workflows including interactive rebasing, conflict resolution, history manipulation, bisecting for bugs, cherry-picking, reflog recovery, and branch management strategies. Git Advanced is an agent skill from aiskillstore/marketplace. Advanced Git operations and workflows including interactive rebasing, conflict resolution, history manipulation, bisecting for bugs, cherry-picking, reflog recovery, and branch management strategies.
When should I use Git Advanced?
Git Advanced fits situations like: interactive rebasing and commit cleanup; complex merge conflict resolution; Git bisect for bug hunting; history rewriting and cleanup.
How do I install Git Advanced in Claude Code?
Run `npx skills add aiskillstore/marketplace --skill git-advanced -a claude-code`. Or copy the skill folder (skills/autumnsgrove/git-advanced in aiskillstore/marketplace) into .claude/skills/git-advanced in your project. Claude Code loads it when a task matches its description.
How do I install Git Advanced in Codex?
Run `npx skills add aiskillstore/marketplace --skill git-advanced -a codex`. Or copy the skill folder (skills/autumnsgrove/git-advanced in aiskillstore/marketplace) into .agents/skills/git-advanced in your project. Codex loads it when a task matches its description.
Can I use Git Advanced 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 aiskillstore/marketplace --skill git-advanced -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-advanced, .gemini/skills/git-advanced, .github/skills/git-advanced and .opencode/skills/git-advanced in your project.
What does Git Advanced need to run?
Going by SKILL.md and its folder, Git Advanced needs a shell for the scripts in its folder and the command-line tools its instructions call (git, npm and bash). Our summary lists: A Bash shell.
Does Git Advanced access the network?
SKILL.md contains no URLs. Its commands use git and npm, which can reach the network depending on how they are called. This is read from the text; nothing was executed.
Is Git Advanced 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 Advanced use?
No licence was found for Git Advanced or its repository. Without one, default copyright applies: ask the author before reusing or redistributing it.
How many tokens does Git Advanced use?
About 2.9k tokens (SKILL.md is roughly 11k 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 8k tokens, read only when the agent opens those files.
What are the alternatives to Git Advanced?
Skills that share tags, products or a category with Git Advanced: Finishing a Development Branch (obra/superpowers, 296k 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, 55k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
Who maintains Git Advanced?
aiskillstore (a GitHub organization) maintains it in aiskillstore/marketplace, which has 430 GitHub stars. The repository holds 1,085 skills in this directory. The repository was last updated on October 7, 2026.
Source: aiskillstore/marketplace on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.