diff --git a/CLAUDE.md b/CLAUDE.md
index c6f7d72..45ec433 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -51,6 +51,9 @@ nix develop --command cargo test        # All tests pass (currently 381)
 ./target/release/lux lint               # Standalone lint pass
 ```
 
+### Commit after every piece of work
+**After completing each logical unit of work, commit immediately.** Do not let changes accumulate uncommitted across multiple features. Each commit should be a single logical change (one feature, one bugfix, etc.). Use `--no-gpg-sign` flag for all commits.
+
 **IMPORTANT: Always verify Lux code you write:**
 - Run with interpreter: `./target/release/lux file.lux`
 - Compile to binary: `./target/release/lux compile file.lux`