skills.rest
wooyek
wooyekCOMMUNITY
Explore all skills by this author →
Website𝕏@wooyekGitHub

dev10x-git-groom

Restructure and polish Git commit history into atomic, user-facing commits.

Updated Aug 27, 2026
Search Tags:#git#code review#version control#rebase#commit history#git grooming
One-click install
npx skills add https://github.com/wooyek/dev10x-ai --skill dev10x-git-groom
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: dev10x-git-groom
Source: https://github.com/wooyek/dev10x-ai/tree/main/codex-skills/dev10x-git-groom
Command: npx skills add https://github.com/wooyek/dev10x-ai --skill dev10x-git-groom

SYSTEM DOCUMENTATION & REQUIREMENTS

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

What problem does it solve?

This Skill streamlines the process of cleaning up and restructuring Git commit history, ensuring that each commit is atomic, well-organized, and tells a clear, user-focused story before merging.

Core Features & Use Cases

  • Restructure Commit History: Reorganize, reword, squash, or split commits to improve clarity.
  • Outcome-Focused Messaging: Guides users to write commit messages that describe user-facing benefits rather than implementation details.
  • Automated Rewrites: Supports non-interactive mass rewriting of commit messages and file renames via a configuration file.
  • Use Case: After a complex feature development, use this Skill to consolidate messy intermediate commits into a few clean, logical steps, making the review process smoother and the history easier to understand.

Quick Start

Use the dev10x-git-groom skill to rewrite commit messages based on the configuration provided in /tmp/claude/git/groom-config.json.

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 a messy git commit history before merging a feature branch?▼

Git grooming restructures messy commit histories into atomic, well-organized commits that tell a clear user-facing story. It uses fixup commits, soft resets, and non-interactive mass rewrites to prepare clean merges.

What is the best way to write outcome-focused git commit messages?▼

Outcome-focused commit messages describe user-facing benefits rather than implementation details. Git grooming guides you to restructure commits so each message clearly communicates the value delivered to the end user.

Can I do a non-interactive mass rewrite of git commit messages?▼

Yes, you can perform a non-interactive mass rewrite of git commit messages and file renames by providing a configuration file to automate the restructuring process across multiple commits without manual intervention.

How do you handle rebase conflicts during git commit restructuring?▼

Handling rebase conflicts during git restructuring requires robust troubleshooting to resolve common issues. The process provides guidance to safely navigate conflicts when squashing, splitting, or rewording commits.

Does git grooming support splitting commits via soft reset?▼

Yes, git grooming supports full restructuring via soft reset. This allows you to uncommit changes while keeping them staged, enabling you to reorganize and split them into logical, atomic commits.

Related Skills

Explore More Software Engineering Skills→
jk278jk278

git-analyzer

Analyze git repositories to summarize commit history and file changes.

Community
Intermediate
JacobPEvansJacobPEvans
3

rebase-pr

Rebase pull requests onto main with signed commits and GitHub API checks.

Community
Advanced
mir-ammir-am
1

git-commit

Generate session-aware git commits with branch creation and selective staging.

Community
Intermediate
mhaldermhalder
2

git-rebase

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

Community
Advanced