About
This Claude Skill automates partial rebasing for squash-merge workflows by analyzing branch history to identify which commits to keep or drop after a squash merge. It generates a rebase plan table and a ready-to-use `git rebase --onto` command. Use it when you need a "smart rebase" after your base branch has been squash-merged, not for simple rebases or conflict resolution.
Quick Install
Claude Code
Recommendednpx skills add sd0xdev/sd0x-dev-flow -a claude-code/plugin add https://github.com/sd0xdev/sd0x-dev-flowgit clone https://github.com/sd0xdev/sd0x-dev-flow.git ~/.claude/skills/smart-rebaseCopy and paste this command in Claude Code to install this skill
GitHub Repository
Frequently asked questions
What is the smart-rebase skill?
smart-rebase is a Claude Skill by sd0xdev. Skills package instructions and resources that Claude loads on demand, so Claude can perform smart-rebase-related tasks without extra prompting.
How do I install smart-rebase?
Use the install commands on this page: add smart-rebase to Claude Code as a plugin, or clone its repository into your skills directory, then restart Claude so it picks up the skill.
What category does smart-rebase belong to?
smart-rebase is in the Design category, tagged general.
Is smart-rebase free to use?
Yes. smart-rebase is listed on AIMCP and free to install. It runs inside Claude, so no separate service account is required to use the skill itself.
Related Skills
Use the executing-plans skill when you have a complete implementation plan to execute in controlled batches with review checkpoints. It loads and critically reviews the plan, then executes tasks in small batches (default 3 tasks) while reporting progress between each batch for architect review. This ensures systematic implementation with built-in quality control checkpoints.
This skill dispatches a code-reviewer subagent to analyze code changes against requirements before proceeding. It should be used after completing tasks, implementing major features, or before merging to main. The review helps catch issues early by comparing the current implementation with the original plan.
This skill provides a comprehensive guide for developers to connect MCP servers to Claude Code using HTTP, stdio, or SSE transports. It covers installation, configuration, authentication, and security for integrating external services like GitHub, Notion, and custom APIs. Use it when setting up MCP integrations, configuring external tools, or working with Claude's Model Context Protocol.
This skill helps developers choose between Claude Code Web and CLI interfaces based on task analysis, then enables seamless session teleportation between these environments. It optimizes workflow by managing session state and context when switching between web, CLI, or mobile. Use it for complex projects requiring different tools at various stages.