Commit
Create clean, well-structured git commits that tell a coherent story.
Process
1. Assess the Working Tree
Run git status (never -uall) and git diff to understand what changed. Also run git log --oneline -5 to match the repo's existing commit message style.
If there are no changes, say so and stop.
2. Group Changes by Intent
Look at the changed files and mentally group them:
- Feature: new functionality (client + server + tests for the same feature = one commit)
- Fix: bug fixes
- Refactor: structural changes that don't change behavior
- Docs: documentation-only changes (CLAUDE.md, README, comments)
- Test: test-only additions or changes
- Chore: config, dependencies, tooling
Rules for grouping:
- Prefer fewer commits. A feature that touches 15 files is still one commit if it's one logical change.
- Only split when intent is genuinely different. "Add collaborative editing" is one commit even if it touches client, server, DB, and tests. But "add collaborative editing" + "fix unrelated CSS bug" should be two commits.
- For a first commit or large initial build, one commit is fine. Don't artificially split an initial implementation.
- Docs updates that accompany code changes go in the same commit. Only separate docs commits for docs-only changes.
3. Present the Plan
Before committing, show the user:
- How many commits you plan to make
- For each commit: the message and which files are included
- Ask for confirmation
4. Create the Commits
For each commit:
- Stage the specific files with
git add <file1> <file2> ... (never git add -A or git add .)
- Commit with a message using this format:
<type>: <concise description>
<optional body — explain WHY, not WHAT. The diff shows what.>
Co-Authored-By: Claude <noreply@anthropic.com>
Types: feat, fix, refactor, docs, test, chore
Message guidelines:
- Subject line under 72 characters
- Use imperative mood ("add", not "added" or "adds")
- The subject should complete the sentence "This commit will..."
- Body is optional — use it for non-obvious context (e.g., "the old approach caused X" or "this unblocks Y")
- Always include the Co-Authored-By trailer
5. Verify
After all commits, run git log --oneline -10 to show the result.
Safety Rules
- Never commit
.env, credentials, or secrets. Check staged files for these patterns and warn.
- Never use
git add -A or git add . — always stage specific files.
- Never amend a commit unless the user explicitly asks.
- Never force push.
- Never skip hooks (
--no-verify).
- If a pre-commit hook fails, fix the issue and create a NEW commit (don't amend). To diagnose, read the pre-commit hook (
.husky/pre-commit or .pre-commit-config.yaml) to see what it runs, then run each command individually to find the failure.
What NOT To Do
- Don't write commit messages that describe every file changed. The diff does that.
- Don't split a single feature across 5 commits just because it touches 5 directories.
- Don't use vague messages like "update code" or "fix stuff".
- Don't commit generated files (
db/schema.ts, dist/, node_modules/, __pycache__/).
1---2name: commit-33description: "Create well-structured git commits from the current working tree. Use when the user says 'commit', 'save my work', 'let's commit this', 'make a commit', or any variation of wanting to commit code to git."4metadata:5 source: https://skillmd.com/skills/kklimuk/commit-36 internal: true7---89# Commit1011Create clean, well-structured git commits that tell a coherent story.1213## Process1415### 1. Assess the Working Tree1617Run `git status` (never `-uall`) and `git diff` to understand what changed. Also run `git log --oneline -5` to match the repo's existing commit message style.1819If there are no changes, say so and stop.2021### 2. Group Changes by Intent2223Look at the changed files and mentally group them:2425- **Feature**: new functionality (client + server + tests for the same feature = one commit)26- **Fix**: bug fixes27- **Refactor**: structural changes that don't change behavior28- **Docs**: documentation-only changes (CLAUDE.md, README, comments)29- **Test**: test-only additions or changes30- **Chore**: config, dependencies, tooling3132Rules for grouping:33- **Prefer fewer commits.** A feature that touches 15 files is still one commit if it's one logical change.34- **Only split when intent is genuinely different.** "Add collaborative editing" is one commit even if it touches client, server, DB, and tests. But "add collaborative editing" + "fix unrelated CSS bug" should be two commits.35- **For a first commit or large initial build, one commit is fine.** Don't artificially split an initial implementation.36- **Docs updates that accompany code changes go in the same commit.** Only separate docs commits for docs-only changes.3738### 3. Present the Plan3940Before committing, show the user:41- How many commits you plan to make42- For each commit: the message and which files are included43- Ask for confirmation4445### 4. Create the Commits4647For each commit:481. Stage the specific files with `git add <file1> <file2> ...` (never `git add -A` or `git add .`)492. Commit with a message using this format:5051```52<type>: <concise description>5354<optional body — explain WHY, not WHAT. The diff shows what.>5556Co-Authored-By: Claude <noreply@anthropic.com>57```5859Types: `feat`, `fix`, `refactor`, `docs`, `test`, `chore`6061Message guidelines:62- Subject line under 72 characters63- Use imperative mood ("add", not "added" or "adds")64- The subject should complete the sentence "This commit will..."65- Body is optional — use it for non-obvious context (e.g., "the old approach caused X" or "this unblocks Y")66- Always include the Co-Authored-By trailer6768### 5. Verify6970After all commits, run `git log --oneline -10` to show the result.7172## Safety Rules7374- **Never commit `.env`, credentials, or secrets.** Check staged files for these patterns and warn.75- **Never use `git add -A` or `git add .`** — always stage specific files.76- **Never amend a commit** unless the user explicitly asks.77- **Never force push.**78- **Never skip hooks** (`--no-verify`).79- **If a pre-commit hook fails**, fix the issue and create a NEW commit (don't amend). To diagnose, read the pre-commit hook (`.husky/pre-commit` or `.pre-commit-config.yaml`) to see what it runs, then run each command individually to find the failure.8081## What NOT To Do8283- Don't write commit messages that describe every file changed. The diff does that.84- Don't split a single feature across 5 commits just because it touches 5 directories.85- Don't use vague messages like "update code" or "fix stuff".86- Don't commit generated files (`db/schema.ts`, `dist/`, `node_modules/`, `__pycache__/`).