--- name: commit-atomic-a03bf1fe180f description: "Group staged changes into atomic commits with commitizen convention" license: MIT compatibility: cline, claude, opencode, amp, codex, gemini, cursor, pi hint: Use when committing staged changes as focused, atomic commits grouped by logical change user-invocable: true metadata: audience: all workflow: git --- # Atomic Commit with Logical Grouping Create atomic commits by logically grouping changes following the commitizen/conventional commits convention. Each commit should represent one logical change with a clear, informative message explaining the **what** and **why**. ## Usage ```bash /commit-atomic ``` ## Process ### 1. Inspect the current changes ```bash git status git diff --staged git diff ``` Review all modified, added, and deleted files to understand the full scope of changes. ### 2. Group changes logically Analyze the changes and group them into **logical, independent units**. Each group should: - Address a single concern or feature - Be independently understandable - Not break the build or tests on its own - Follow the dependency order (low-level to high-level) **Grouping strategies:** - By feature or concern (e.g., authentication, UI, database) - By type (e.g., refactoring, bug fix, new feature) - By layer (e.g., model, service, controller) ### 3. Stage each group intentionally **Stage files explicitly with `git add `.** Avoid `git add -A` or `git add --all`: ```bash # Stage specific files git add # Stage specific hunks interactively git add -p # Verify what is staged before committing git diff --staged ``` ### 4. Commit each group with a commitizen message Follow the **commitizen conventional commits** format: ```text (): [optional body] [optional footer] ``` **Types:** | Type | When to use | | ---------- | ----------------------------------------------------- | | `feat` | A new feature | | `fix` | A bug fix | | `docs` | Documentation only changes | | `style` | Formatting, missing semicolons (no code logic change) | | `refactor` | Code change that is neither a fix nor a feature | | `perf` | A code change that improves performance | | `test` | Adding or fixing tests | | `chore` | Build process or auxiliary tool changes | | `ci` | CI configuration changes | | `build` | Changes that affect the build system or dependencies | | `revert` | Reverts a previous commit | **Writing good commit messages:** - **Subject line**: Imperative mood, max 72 characters, no period at end - **Body** (optional): Explain the **why**, not just the what; wrap at 72 characters - **Footer** (optional): Reference issues (`Closes #123`), breaking changes (`BREAKING CHANGE: ...`) **Examples:** ``` feat(auth): add JWT refresh token support Refresh tokens allow users to stay logged in without re-authenticating. This reduces friction for long-running sessions. Closes #42 ``` ``` fix(api): handle null response from external service The external API occasionally returns null for optional fields. Previously this caused an unhandled TypeError at runtime. ``` ```text refactor(utils): extract date formatting into shared helper Consolidates duplicate date formatting logic spread across three modules into a single reusable function. ``` ### 5. Verify after each commit ```bash git log --oneline -5 git status ``` Ensure the working tree is clean after all logical groups are committed. ## Rules - ❌ Prefer `git add ` over `git add -A` or `git add --all` - ❌ Keep each commit focused on one logical change - ✅ Stage files explicitly with `git add ` or `git add -p` - ✅ Verify staged changes with `git diff --staged` before committing - ✅ Write messages in imperative mood ("add feature" not "added feature") - ✅ Explain the **why** in the commit body when the change is non-obvious - ✅ Keep each commit independently buildable and testable --- Source attribution: jellydn Original project: https://github.com/jellydn/my-ai-tools/blob/920edf11fefa249af3bce8750625d4ca92ed8364/skills/commit-atomic/SKILL.md License: MIT License information: https://opensource.org/license/mit Original upstream instructions; downloaded from Mega AI Hub. ## Upstream license notice The MIT License (MIT) Copyright (c) 2026 Dung Huynh Duc Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # Mega AI Hub resource metadata Creator / publisher: jellydn Original project: https://github.com/jellydn/my-ai-tools/blob/920edf11fefa249af3bce8750625d4ca92ed8364/skills/commit-atomic/SKILL.md Attribution basis: Source repository record Fields of work: Content & Media, Development & Engineering Roles: Backend Developer, DevOps / SRE, Frontend Developer, Full-Stack Developer, Technical Writer Specialties: Cross Platform, Git Tools: Tool not specified Country applicability: Country not specified Classification basis: Source catalog labels Instruction SHA-256: ad6d7b5f7448b509211b3bd9658b8765f849838af1876e9ca9c97689fea0079f