Rebase Assistant
The Rebase Assistant helps you quickly update your Git branches to match a target remote branch, streamlining workflow and reducing merge conflicts.
Install on your platform
We auto-selected Claude Code based on this skill’s supported platforms.
Run in terminal (recommended)
claude mcp add rebase-assistant npx -- -y @trustedskills/rebase-assistant
Or manually add to ~/.claude/settings.json
{
"mcpServers": {
"rebase-assistant": {
"command": "npx",
"args": [
"-y",
"@trustedskills/rebase-assistant"
]
}
}
}Requires Claude Code (claude CLI). Run claude --version to verify your install.
About This Skill
What it does
The rebase-assistant skill helps users understand and apply Git rebase commands. It can explain what rebasing is, how it differs from merging, and generate appropriate rebase commands based on user descriptions of desired outcomes. The assistant aims to simplify the often complex process of rewriting commit history in a Git repository.
When to use it
- You're new to Git and want to learn more about rebasing.
- You need help constructing the correct
git rebasecommand for a specific scenario. - You’re trying to clean up your local branch before sharing it with others.
- You want to understand the implications of rebasing a public branch.
Key capabilities
- Explains Git rebasing concepts.
- Generates
git rebasecommands based on user input. - Differentiates between merging and rebasing workflows.
Example prompts
- "Explain what rebasing is in simple terms."
- "I want to move my last three commits onto the 'develop' branch. What git command should I use?"
- "What are the risks of rebasing a public branch?"
Tips & gotchas
Rebasing can rewrite history, so it’s generally recommended to avoid rebasing branches that have already been pushed to a shared repository. Always back up your work before attempting a rebase.
Tags
TrustedSkills Verification
Unlike other registries that point to live repositories, TrustedSkills pins every skill to a verified commit hash. This protects you from malicious updates — what you install today is exactly what was reviewed and verified.
Security Audits
| Gen Agent Trust Hub | Pass |
| Socket | Pass |
| Snyk | Pass |
🌐 Community
Passed automated security scans.