atomic-commit
Atomic Commit helps create clean, atomic commits by analyzing changes, detecting mixed concerns, and ensuring each commit is a complete unit of work. Key words to detect are atomic, atomic commits, clean commits.
When & Why to Use This Skill
The Atomic Commit skill is a specialized developer tool designed to streamline version control by ensuring every git commit is clean, focused, and independent. It analyzes code changes to detect mixed concerns—such as combining bug fixes with new features—and helps developers group related files into logical, atomic units. By enforcing conventional commit standards and verifying builds, it ensures a maintainable codebase where changes are easy to review, test, and revert.
Use Cases
- Refactoring and Feature Separation: Automatically identify and separate structural code improvements from new functional additions to maintain a readable and professional project history.
- Multi-Bug Fix Management: Organize multiple unrelated small fixes into distinct, independent commits instead of a single monolithic update, making it easier to track specific changes.
- Conventional Commit Standardization: Ensure all commit messages follow industry best practices (feat, fix, refactor) to facilitate automated changelog generation and improve team collaboration.
- Pre-Commit Quality Assurance: Validate that each individual unit of work passes necessary builds and tests before it is finalized, preventing broken code from entering the repository.
| name | Atomic Commit |
|---|---|
| description | Atomic Commit helps create clean, atomic commits by analyzing changes, detecting mixed concerns, and ensuring each commit is a complete unit of work. Key words to detect are atomic, atomic commits, clean commits. |
Atomic Commit
Standalone skill for non-TDD workflows. Helps create clean, atomic commits by analyzing changes and detecting mixed concerns.
Atomic Commit Definition
- Does exactly one thing (one feature/fix/refactor)
- Leaves codebase in working state (builds and tests pass)
- Can be reverted independently
- Doesn't mix unrelated concerns
Workflow
1. Analyze Changes
git status && git diff && git diff --staged
2. Detect Mixed Concerns
Look for files mixing:
- Multiple features
- Bug fixes + features
- Refactoring + new functionality
- Multiple unrelated bug fixes
- Code + documentation (unless for same feature)
- Tests for multiple features
3. Group Commits
Group files by shared purpose. Present grouping to user for confirmation.
Example:
Group 1: "Add user auth" → auth/login.ts, auth/session.ts, tests/auth/login.test.ts
Group 2: "Fix password validation" → validators/password.ts, tests/validators/password.test.ts
4. Create Each Commit
For each group:
- Stage:
git add <file1> <file2>(NOgit add .) - Review:
git diff --staged - Test: Run tests, ensure pass
- Build: Run build if applicable, ensure success
- Commit: Use conventional commit format
- Verify:
git log -1 --oneline
Conventional commit types: feat|fix|refactor|docs|test|chore|perf|style
5. Final Check
git log --oneline -n <N>
Issue Integration
- Check user message or branch name for issue number
- IF no issue: ask if user wants to create one
- IF user does not want to provider, leave it blank
- IF yes: help write description, offer
gh issue createorglab issue create- Include in commits:
"feat: description (#42)"
- Include in commits:
Guidelines
DO: One logical change, include related tests, run tests, clear messages, issue numbers DON'T: Mix features/fixes/refactors, commit broken code, vague messages, debug code
TODO Pattern
☐ Analyze: git status/diff ☐ Identify file purposes ☐ Detect mixed concerns ☐ Group into atomic commits ☐ Confirm with user ☐ For each: stage → review → test → build → commit → verify ☐ Final review
Activation
Use when user says: "atomic", "clean commits", "break down commits", "split commits" DO NOT use for TDD workflows (use TDG skill).
Closing
"Created N atomic commits. Tests pass. Would you like to review history, push, or create PR?"