What happens if I don't like the new history?

The skill automatically creates a timestamped backup branch before starting. You can easily revert to your original state by checking out that backup branch.

Is it safe to push the changes to a shared remote?

Yes, it uses the --force-with-lease flag when pushing, which ensures you don't accidentally overwrite someone else's work on the same branch.

Does this skill delete my code or changes?

No, the skill performs a soft reset which preserves all of your changes in the working directory. It only restructures how those changes are grouped into commits.

How does it determine the commit groups?

It analyzes the full diff against the base branch to identify distinct features, setup files, tests, and documentation, then proposes a logical order for the new commits.

Can I use this on the main or master branch?

No, the skill includes a safety check that prevents execution on protected branches like main or master to avoid disrupting the project's primary history.

Git History Rewriter

Name: Git History Rewriter
Author: doodledood

bydoodledood

•

Developer Tools

Restructures messy development branches into logical, reviewer-friendly commits using Conventional Commit standards.

About

This skill automates the tedious process of cleaning up a work-in-progress branch before opening a pull request. By analyzing the total diff since the base branch, it groups changes by logical concern—such as core logic, tests, and documentation—rather than chronological order, generating a sequence of atomic Conventional Commits. It ensures safety by creating automatic backups and performing a soft reset to preserve code while restructuring the history, making it an essential tool for maintaining high-quality, readable repositories and facilitating smoother code reviews.

Key Features

Creates permanent backup branches before any destructive git operations
Automatically generates descriptive Conventional Commit messages
Safely updates remotes using the force-with-lease protocol
Interactive proposal mode allows for manual adjustment of the commit plan
8 GitHub stars
Analyzes total diffs to group changes by logical architectural concerns

Use Cases

Splitting a monolithic feature branch into smaller, atomic commits for better traceability
Standardizing a branch's commit history to follow strict Conventional Commit guidelines
Cleaning up messy 'work-in-progress' commits before submitting a Pull Request

About

Key Features

Creates permanent backup branches before any destructive git operations
Automatically generates descriptive Conventional Commit messages
Safely updates remotes using the force-with-lease protocol
Interactive proposal mode allows for manual adjustment of the commit plan
8 GitHub stars
Analyzes total diffs to group changes by logical architectural concerns

Use Cases

Splitting a monolithic feature branch into smaller, atomic commits for better traceability
Standardizing a branch's commit history to follow strict Conventional Commit guidelines
Cleaning up messy 'work-in-progress' commits before submitting a Pull Request