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.

Marketplace

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 →

Claude Code (CLI) Fast

skilz install cblecker/claude-skills/rebasing-branch

OpenCode (CLI) Fast

skilz install cblecker/claude-skills/rebasing-branch --agent opencode

OpenAI Codex (CLI) Native

skilz install cblecker/claude-skills/rebasing-branch --agent codex

Gemini CLI (Project) Project

skilz install cblecker/claude-skills/rebasing-branch --agent gemini

First time? Install Skilz: pip install skilz

Works with 22+ AI coding assistants

Cursor, Aider, Copilot, Windsurf, Qwen, Kimi, and more...

View All Agents

For Claude Desktop Easy

Download Agent Skill ZIP

Extract and copy to ~/.claude/skills/ then restart Claude Desktop

Manual Installation

1. Clone the repository:

git clone https://github.com/cblecker/claude-skills

2. Copy the agent skill directory:

cp -r claude-skills/git-workflows/skills/rebasing-branch ~/.claude/skills/

Owner: cblecker (GitHub)
Repository: claude-skills
Type: Non-Technical
Meta-Domain: general
Primary Domain: general
Sub-Domain: git branch workflow
Market Score: 64

Agentic Skill Grades →

Agent Skill Grade

Score: 64/100 Click to see breakdown

Score Breakdown

Spec Compliance

0/15

PDA Architecture

22/30

Ease of Use

22/25

Writing Style

8/10

Utility

17/20

Modifiers: -5

Areas to Improve

Invalid or incomplete frontmatter
Single-file monolith
Name convention violations

Recommendations

Focus on improving Spec Compliance (currently 0/15)
Address 3 high-severity issues first
Add trigger phrases to description for discoverability

Graded: 2026-01-05

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 immedi...

Browse Category

More general Agentic Skills

Report Security Issue

Found a security vulnerability in this agent skill?