Dev10x:git-groom

Clean and reorganize git commit history with squash, reorder, and reword strategies.

7|2|Updated Apr 24, 2026

Search Tags:#git #development workflow #code organization #commit history #pre-merge cleanup

Ready to run

npx skills add https://github.com/Dev10x-Guru/Dev10x-Claude --skill dev10x-git-groom-dev10x-guru

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: Dev10x:git-groom
Source: https://github.com/Dev10x-Guru/Dev10x-Claude/tree/main/skills/git-groom
Command: npx skills add https://github.com/Dev10x-Guru/Dev10x-Claude --skill dev10x-git-groom-dev10x-guru

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill requires git, and includes scripts (resource) and references (resource) components.

What problem does it solve?

This skill addresses the challenge of merging code with a clean commit history. It cleans up git commit history to ensure atomic, well-organized commits that tell a clear story.

Core Features & Use Cases

Commit History Cleanup: Squash fixups, reorder, and reword commits for a cleaner history.
Pre-merge Checks: Performs checks for open threads and spec drift before cleaning.
Strategic Cleanup: Offers different cleanup strategies including fixups, full restructures, mass rewrites, and interactive rebases.
Use Case: Before merging a branch, run this skill to ensure the commit history is presentable, which is crucial for maintaining code quality and readability.

Quick Start

To start the cleanup process for your current branch, use the command: Skill('Dev10x:git-groom').

Frequently Asked Questions about Dev10x:git-groom

High-intent search queries and answers about installing and using this skill.

FAQPage Schema

How do I clean up git commit history before merging a branch?▼

To clean up git commit history before merging, you can squash fixups, reorder, and reword commits using interactive rebase strategies. This process ensures your commits are atomic and tell a clear, readable story for maintainers.

What is the best way to squash fixup commits in a pre-merge workflow?▼

The best way to squash fixup commits in a pre-merge workflow is to apply strategic history cleanup that automatically consolidates fixup commits with their originals. This reorganizes your branch to ensure a clean, presentable merge story.

Can I perform pre-merge checks for spec drift and open threads before restructuring commits?▼

Yes, pre-merge checks for open threads and spec drift are performed before restructuring commits. Running these checks ensures your code organization aligns with specifications before you apply interactive rebase or mass rewrite strategies.

Does git interactive rebase support mass rewriting and reordering of commit history?▼

Git interactive rebase supports mass rewriting, reordering, and rewording of commit history. These cleanup strategies allow you to fully restructure commits to enhance code readability and maintainability before the final merge.

When do I need to restructure my git commit history?▼

You need to restructure your git commit history when your branch contains messy, disjointed commits that obscure the development story. Cleaning and reorganizing these commits before merging ensures code quality and maintains a clear project history.