organize-commits

Group staged and unstaged git changes into logical conventional commits.

Updated Feb 4, 2026
One-click install
npx skills add https://github.com/cbemister/claude-code --skill organize-commits
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: organize-commits
Source: https://github.com/cbemister/claude-code/tree/main/.claude/skills/organize-commits
Command: npx skills add https://github.com/cbemister/claude-code --skill organize-commits

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps you split a collection of changes across files into logical, focused commits with conventional messages, improving history clarity and traceability.

Core Features & Use Cases

  • Analyze staged and unstaged changes to identify cohesive groupings by purpose (feat, fix, refactor, style, docs, chore, test, perf).
  • Propose a commit plan that splits changes into small, atomic commits with clear scope.
  • Provide guidance and commands to execute the planned commits and maintain a clean history.

Quick Start

Review your current git state with the commands git status, git diff --stat, and git diff --staged --stat, then follow the suggested commit plan to create atomic commits.

Frequently Asked Questions about organize-commits

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

FAQPage Schema
How do I split multiple changes into logical atomic commits?

You can organize changes by analyzing your git state with git status and git diff --stat to identify cohesive groupings by purpose. This produces a commit plan that splits changes into small, focused commits with conventional messages.

What is the best way to organize a chaotic git history with conventional commits?

Organizing a chaotic git history involves grouping file changes by purpose such as feat, fix, refactor, or docs. This approach produces a clean, navigable commit trace with conventional commit messages and atomic commits.

Can I group staged and unstaged git changes by feature or bug fix?

Yes, you can group staged and unstaged changes by feature or bug fix. Analyzing the current git state identifies logical groupings across files, resulting in a commit plan that guides the execution of focused atomic commits.

How do I generate a commit plan for changes across multiple files?

Generate a commit plan by reviewing your git state with git status and git diff commands. The plan analyzes file changes, proposes logical groupings by purpose, and provides commands to execute atomic commits.

Do I need to stage all files before organizing commits?

You do not need to stage all files before organizing commits. The process analyzes both staged and unstaged changes to identify logical groupings, producing a commit plan for creating focused, conventional commits.