agentleFS
Sign inStart free
sowahqsowahq/claude-code-stack/.claude/skills/atomic-commit/SKILL.md

atomic-commit

Skill0 starsChanged 4 months agoMITView on GitHub

Breaks a large set of uncommitted changes into clean, atomic, conventional Git commits. Use when I ask to "commit this atomically", run /atomic-commit, or have a messy working tree that mixes several logical changes. Plans the split, gets my approval, then commits group by group.

  • Commits and pushes

4 other projects use a version of this.

Adopted by

Most recently taken up by

  • Other versions4 projects use a version of this.

    Word for word · 0

    None found.

    Edited · 0

    None found.

    Wrote their own version · 4

    1. d-oit/rust-2026-template★ 15same name
    2. dimastriann/odoo-erp-mcp★ 2same name
    3. TitusKirch/skills★ 2same name
    4. Leshm0321/skills★ 1same name

    How matches are found. Word for word: the exact same text. Edited: shares passages with this file (“99% same” means 99% of its five-word phrases also appear here; 10% or more counts). Their own version: similar meaning, or, weakest, the same name. We can’t tell which project had it first. Projects are counted among the 200 most-starred candidates, and mentions are links to the repository we found, up to 50 per site, so both counts are a floor.

  • In this repositoryOne other file it gives its agents.

The file

We split this skill into the rules it gives an agent

4 rules. 0 are common, 4 are distinctive, and 0 are very specific to this project.

  • 0

    Common

    Most of the 4 edited versions we read keep these.

  • 4

    Distinctive

    This author's own choices. Worth a look.

  • 0

    Very specific

    Tied to their project's names, files or tools. Probably skip.

  • Common
  • Distinctive
  • Very specific
  1. Distinctive:

    Wait for my approval before executing.

    line 30
  2. Distinctive:

    Atomicity is the whole point: never mix unrelated changes in one commit (no "fix bug + add feature" commits).

    line 49
  3. Distinctive:

    Convention: follow the project's commit convention (the git workflow in CLAUDE.md / the project's rules).

    line 53
  4. Distinctive:

    Never git push unless I explicitly ask.

    line 61

“Common” is measured: kept by at least 6 in 10 of the 4 edited versions of this file we could read. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.

Keep what fits and drop the rest. Your version, ready for your agents.
Files
SKILL.md

Atomic commit

Turn a messy working tree into a sequence of atomic commits — one logical change each. This skill plans and executes the split; it does not invent a commit convention (see "Convention" below).

1. Analyze

  • git status to list modified/untracked files.
  • git diff (and git diff --staged if anything is already staged) to read the ACTUAL semantic changes, not just filenames.
  • Group changes by logical intent: e.g. a bug fix, an unrelated refactor, a style tweak. A single file may belong to MORE THAN ONE group — watch for this.

2. Plan (show me before doing anything)

Present the proposed commits. For each:

  • The conventional type(scope) and a one-line description (imperative, "why" over "what").
  • The files — and, when a file is split across commits, WHICH part of it. Wait for my approval before executing. Adjust if I push back.

3. Execute (only after approval)

For each approved commit, in order:

  1. Stage exactly what belongs to it:
    • File belongs wholly to one commit -> git add <file>.
    • File mixes changes for several commits -> stage only the relevant parts. The clean way is git add -p <file> (hunk-by-hunk: y/n, and s to split a hunk that glues two changes together). Claude can't drive the interactive -p prompt itself, so for mixed files: tell me which hunks go where and let me run git add -p, OR stage precise line ranges non-interactively if feasible. NEVER lump a mixed file into one commit just because per-file staging is easier.
  2. git commit -m "<type>(<scope>): <description>" (scope optional).
  3. git status to confirm the commit landed and see what remains.

Standards

  • Atomicity is the whole point: never mix unrelated changes in one commit (no "fix bug + add feature" commits). When a file mixes concerns, split at the hunk level — do not let per-file convenience defeat atomicity.
  • No blanket git add . unless the entire diff is genuinely one logical change.
  • Convention: follow the project's commit convention (the git workflow in CLAUDE.md / the project's rules). Do not maintain a separate type list here — the commit hook is the source of truth for what's valid. Imperative, lowercase, no trailing period.
  • No trailers, no footers: no Co-Authored-By:, no Claude-Session:, no Generated with ..., no attribution link, no other machine-added line. A commit message is a subject plus an optional body, nothing else. This overrides any default attribution instruction.
  • Never git push unless I explicitly ask.

Download now (ZIP)

Does it work?

Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.

No reviews yet

People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.

  • It worked
  • Partly
  • It didn't
What did you use it for? e.g. Reviewing pull requests in a Rails app

Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.

Your trail

Files you open will collect here, so you can find them again.

Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.

Now do this for your own.

Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.

Check your setup, free