Skip to main content
skill CX Codex

Atomic Commit — Claude Code skill: what it does, how to install

Atomic Commit splits mixed Git changes into isolated, independently revertible commits verified by test suites and builds.

MIT 5 installs ★ 84 updated 2025-11-21

Install into Claude Code · Skills CLI (Vercel) All methods and platforms ↓
npx skills add chanwit/tdg --skill atomic-commit -a claude-code
Open on GitHub

What Atomic Commit does

This workflow inspects uncommitted work using git status, git diff, and git diff --staged. It flags mixed concerns, such as combining new features with bug fixes, bundling refactoring into functional changes, or staging tests across multiple modules. Files are sorted into focused groups and shown to the developer before making any changes.

Blind staging with git add . is explicitly forbidden. Instead, the assistant stages individual files using git add <file>, inspects staged diffs, runs tests, triggers the project build, and writes messages matching Conventional Commits standards. It also checks branch names and prompts for issue IDs, offering to trigger gh issue create or glab issue create when needed.

This skill is built for non-TDD workflows. The author recommends the companion TDG skill instead whenever test-driven development is in use.

What it helps with

  • separate bug fixes from new feature logic across working tree files
  • prevent bulk staging by enforcing individual file additions
  • ensure tests and builds pass before every single commit
  • link GitHub or GitLab issue references to commit summaries

Example prompts for the agent

  • Review my changes and create atomic commits
  • Break down commits so bug fixes are separated from features
  • Clean commits: group unstaged files and run tests on each batch

How to install Atomic Commit

1Skills CLI (Vercel)

npx skills add chanwit/tdg --skill atomic-commit -a claude-code

2Manually: put the files in place

~/.claude/skills/atomic/SKILL.md

Copy the whole skill folder; for one project use .claude/skills/atomic/

Step by step, with commands for each platform: How to install skills in Claude Code: five ways

Questions about Atomic Commit

How to install Atomic Commit in Claude Code?

Run npx skills add chanwit/tdg --skill atomic -a claude-code in your terminal. This creates the skill configuration at ~/.claude/skills/atomic/SKILL.md.

What does Atomic Commit do?

It identifies mixed logic in your working tree, groups files by intent, requires confirmation, and generates isolated commits backed by passing tests.

Can I use this skill with TDD workflows?

The author notes it is intended strictly for non-TDD setups. For test-driven workflows, switch to the TDG skill from the same repository.

Source text

SKILL.md · MIT
---
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
```bash
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:
1. Stage: `git add <file1> <file2>` (NO `git add .`)
2. Review: `git diff --staged`
3. Test: Run tests, ensure pass
4. Build: Run build if applicable, ensure success
5. Commit: Use conventional commit format
6. Verify: `git log -1 --oneline`

Conventional commit types: `feat|fix|refactor|docs|test|chore|perf|style`

### 5. Final Check
```bash
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 create` or `glab issue create`
  - Include in commits: `"feat: description (#42)"`

## 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?"

© chanwit · MIT · chanwit/tdg

Similar skills

All skills for Git and GitHub →

Project sponsors

Companies that keep this analytics open