git-rebase

Git rebase safely reorganizes and combines commits by creating an automated backup branch before any changes, then guiding you through interactive rebase to squash multiple commits into one logical entry. The backup ensures you can rollback if needed.

Rebase your feature branch onto main while squashing related commits into clean, logical units. This flattens iterative changes into meaningful history, making the merge cleaner and easier to review without creating multiple small commits.

Yes, interactive rebase lets you reorder commits safely. This Skill enforces mandatory backup creation and validates the result afterward, preventing accidental data loss while you rearrange commit sequence.

Rebase your branch onto main to apply your commits on top of the latest changes, keeping history linear. This avoids merge commits and ensures your feature integrates cleanly with recent main updates.

Ensure your working directory is clean before rebasing. This Skill enforces a clean state requirement and creates timestamped backup branches automatically, so you have a recovery point if the rebase encounters conflicts or errors.

Avoid rebasing commits already pushed to shared branches where others depend on them, as it rewrites history and breaks downstream work. Use rebase only on local feature branches or branches where the team expects history cleanup before merge.