git-rebase

What problem does it solves? Manipulating Git history (reordering commits, squashing multiple entries, or updating a branch's base) can be complex and risky. Mistakes can lead to lost commits, a corrupted repository state, or a messy history that hinders collaboration. This Skill provides a guided, safe process to perform these advanced Git operations.

Core Features & Use Cases

• Automated Backup: Creates a mandatory timestamped backup branch before any rebase operation, ensuring a safe rollback point if anything goes wrong.
• Commit Reordering & Squashing: Facilitates interactive rebase to change commit order or combine multiple commits into a single, clean entry.
• Branch Update: Safely rebases feature branches onto the latest main, keeping history linear and up-to-date without manual conflict resolution.
• Use Case: You have several small, iterative commits on your feature branch that you want to combine into one logical commit before merging to main. This Skill guides you through the process, ensures a backup is made, and validates the outcome, preventing accidental data loss and ensuring a clean history.

Quick Start

Use the git-rebase skill to interactively rebase the current branch onto 'main', squashing the last 3 commits.