diff --git a/CLAUDE.md b/CLAUDE.md
index d4546dd..f2ff8ee 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -40,6 +40,30 @@ professional, trustworthy, and calm. Users are often in distress.
 5. **Always update docs/memory/** after completing work — log what was done, decisions made, and open questions
 6. **Run `npm run build:tokens`** after any token JSON change
 7. **Verify in Storybook** before marking any component done
+8. **Commit and push after completing each unit of work** — see Git workflow below
+
+## Git workflow
+
+**Remote:** Gitea at `http://192.168.50.211:3000/richie/ParsonsFA.git` (credentials stored via git credential helper)
+
+**After completing each unit of work** (a component, a token change, a bug fix, etc.):
+1. Stage the changed files (`git add` — prefer naming specific files over `git add -A`)
+2. Commit with a clear message describing what was done
+3. Push to origin (`git push`)
+
+This is **not optional** — the user relies on the git history for rollback safety. Each commit should represent a coherent, working state (Storybook builds, TypeScript compiles). Do not batch multiple unrelated changes into a single commit.
+
+**Commit message format:**
+```
+Short summary (imperative mood, <70 chars)
+
+- Bullet points with detail if needed
+- Reference decision IDs (D001, D002...) when relevant
+
+Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
+```
+
+**Branch strategy:** All work on `main` for now. Feature branches when the project grows.
 
 ## Memory system