git-rebase

Perform interactive git rebases, squash commits, and resolve conflicts.

2|Updated Oct 5, 2025

Search Tags:#git #workflow #history #rebase #conflicts #git-rebase

One-click install

npx skills add https://github.com/mhalder/dotfiles --skill git-rebase-mhalder

Or copy as Structured Prompt for Agent▼

Please help me install this Agent Skill.
Skill: git-rebase
Source: https://github.com/mhalder/dotfiles/tree/main/claude/.claude/skills/git-rebase
Command: npx skills add https://github.com/mhalder/dotfiles --skill git-rebase-mhalder

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Helps you perform interactive rebases, squash commits, and resolve conflicts to clean commit history.

Core Features & Use Cases

Interactive guidance: Step-by-step rebasing with safety checks.
Conflict resolution: Assist with resolving conflicts and continuing rebase.
Non-destructive workflow: Encourages backups and warns about force-push.

Quick Start

Start an interactive rebase using git rebase -i and follow the prompts with on-screen guidance.