rebasing-branch
Standard workflow for all rebase operations ('rebase branch', 'rebase on main', 'rebase onto'): replaces bash-based git rebase workflows with Git Safety Protocol—syncs base branch first, prevents mainline rebase errors, preserves working state, provides conflict resolution guidance. Canonical rebase implementation for git-workflows.
Third-Party Agent Skill: Review the code before installing. Agent skills execute in your AI assistant's environment and can access your files. Learn more about security
Installation for Agentic Skill
View all platforms →skilz install cblecker/claude-skills/rebasing-branch skilz install cblecker/claude-skills/rebasing-branch --agent opencode skilz install cblecker/claude-skills/rebasing-branch --agent codex skilz install cblecker/claude-skills/rebasing-branch --agent gemini
First time? Install Skilz: pip install skilz
Works with 22+ AI coding agents
Cursor, Aider, Copilot, Windsurf, Qwen, Kimi, and more...
Extract and copy to ~/.claude/skills/ then restart Claude Desktop
git clone https://github.com/cblecker/claude-skills cp -r claude-skills/git-workflows/skills/rebasing-branch ~/.claude/skills/ Need detailed installation help? Check our platform-specific guides:
Related Agentic Skills
parallel-worktrees
by SpillwaveSolutionsParallel development using git worktrees with Claude Code subagents. Use when spawning multiple async Claude agents across isolated worktrees, running...
creating-branch
by cbleckerStandard workflow for all branch operations ('create branch', 'new branch', 'start branch for'): replaces bash-based git checkout/branch workflows—det...
worktree-manager
by WirasmCreate, manage, and cleanup git worktrees with Claude Code agents across all projects. USE THIS SKILL when user says "create worktree", "spin up workt...
worktree-manager
by WirasmCreate, manage, and cleanup git worktrees with Claude Code agents across all projects. USE THIS SKILL when user says "create worktree", "spin up workt...
Agentic Skill Details
- Repository
- claude-skills
- Type
- Non-Technical
- Meta-Domain
- general
- Primary Domain
- general
- Sub-Domain
- branch workflow
- Market Score
- 64.0
Agent Skill Grade
D
Score: 64/100
Click to see breakdown
Score Breakdown
Areas to Improve
- Invalid YAML syntax - parsing failed
- 318-line file with no reference extraction; error handling patterns repeated across phases
- No frontmatter to check name
Recommendations
- Focus on improving Spec Compliance (currently 0/15)
- Address 3 high-severity issues first
- Add trigger phrases to description for discoverability
Graded: 1/5/2026
Developer Feedback
I took a look at your rebasing-branch skill and wanted to share some thoughts.
Links:
The TL;DR
You're at 64/100, which puts you in D territory (needs work). The grading is based on Anthropic's best practices for agentic skills. Your Ease of Use is pretty strong at 22/25—the metadata and navigation are solid—but Spec Compliance is completely missing at 0/15, which is a massive anchor dragging everything down.
What's Working Well
- Clear phase structure - Your 8 numbered phases with headers and objectives make it easy to follow the workflow, even in a 318-line file
- Solid trigger definitions - "rebase branch", "rebase on main", "rebase onto" are specific and discoverablePHASE, good scope boundaries vs. other skills
- Comprehensive error handling - You're thinking through edge cases like mainline protection and state preservation, which shows you understand real Git complexity
- Strong validation gates - Each phase has clear success/failure criteria with explicit next steps
The Big One: Invalid Frontmatter
Here's the thing—your frontmatter isn't parsing, which is why you're getting zero points on Spec Compliance. This isn't just a formatting issue; it breaks discoverability in skill registries.
Your current frontmatter is missing the closing --- and has a malformed description field:
---
name: rebasing-branch
description: Standard workflow for all rebase operations...
Here's what it should look like:
---
name: rebasing-branch
description: Performs rebasing branch operations. Use when asked to "rebasing branch", "run rebasing branch", or similar rebase requests.
---
This one fix gets you +5 points immediately. But there's more—your description needs to include actual trigger phrases like "rebasing branch help" or "rebase my feature" so agents can recognize when to invoke you. Right now it's descriptive but doesn't give trigger clarity.
Other Things Worth Fixing
Extract error handling to a reference file - You've got 25+ lines of repeated error patterns across phases. Move that to
references/common-errors.mdand you'll shed weight while improving your Progressive Disclosure Architecture score. Currently 22/30, this could push you to 25+.Add concrete input/output examples - Your "When to Use" section lists triggers but doesn't show an actual example like: Input: "rebase my feature branch onto develop" → Extracts: target=develop, preserve_dates=false. This would bump your Utility score (currently 17/20).
Tighten validation gate formatting - Phase 1's IF/ELSE blocks are a bit verbose. A simple table (
| Condition | Action | Message |) would be cleaner and save ~8 lines. Small win on Writing Style (8/10).
Quick Wins
- Fix frontmatter (+5 points) - Validate YAML, add trigger phrases to description
- Extract error patterns (+3 points) - Move to
references/directory - Add input examples (+1-2 points) - Show what the skill looks like in action
- Total potential: Get to 75-80 with these three changes
Checkout your skill here: SkillzWave.ai | SpillWave We have an agentic skill installer that install skills in 14+ coding agent platforms. Check out this guide on how to improve your agentic skills.
Browse Category
More general Agentic SkillsReport Security Issue
Found a security vulnerability in this agent skill?