diff --git a/CLAUDE.md b/CLAUDE.md
index d15f0f1..9c03418 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -165,3 +165,29 @@ Match the existing structure under /docs/:
 - Volunteer features → /docs/volunteer/
 - Portal features → /docs/portal/
 - General concepts → /docs/guide/
+
+## Git Commit Policy
+
+**After every successful task completion, commit the changes immediately.**
+
+Rules:
+1. After all tests pass and build succeeds, stage and commit the changed files
+2. Use conventional commit messages: `feat:`, `fix:`, `refactor:`, `docs:`, `test:`, `chore:`
+3. One commit per logical unit of work (one feature, one bugfix, one refactor)
+4. Never bundle unrelated changes in a single commit
+5. Never commit with failing tests
+6. Do NOT push automatically — only commit locally. The developer will push manually.
+
+Commit message format:
+```
+feat: short description of the feature
+fix: short description of the bug fix
+refactor: short description of the refactoring
+docs: short description of documentation changes
+test: short description of test additions
+```
+
+Examples:
+- `feat: person tags system with org-level skills and sync endpoint`
+- `fix: auth race condition on page refresh`
+- `docs: update SCHEMA.md with person_identity_matches table`