Skip to content

Commit 2033514

Browse files
authored
Merge pull request #1 from StrangeDaysTech/docs/initial-claude-md-git-rules
docs: add Git Operations rules to CLAUDE.md
2 parents b594923 + 198196f commit 2033514

2 files changed

Lines changed: 73 additions & 0 deletions

File tree

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
---
2+
id: AILOG-2026-04-02-001
3+
title: Add Git Operations rules to CLAUDE.md
4+
status: accepted
5+
created: 2026-04-02
6+
agent: claude-code-v1.0
7+
confidence: high
8+
review_required: false
9+
risk_level: low
10+
eu_ai_act_risk: not_applicable
11+
nist_genai_risks: []
12+
iso_42001_clause: [5]
13+
lines_changed: 7
14+
files_modified: [CLAUDE.md]
15+
observability_scope: none
16+
tags: [governance, git-workflow, claude-md, configuration]
17+
related: []
18+
---
19+
20+
# AILOG: Add Git Operations rules to CLAUDE.md
21+
22+
## Summary
23+
24+
Added a `### Git Operations` section to `CLAUDE.md` with the critical Git workflow rules: no direct commits to `main`, required branch prefixes, and conventional commit format. This makes `CLAUDE.md` self-sufficient for the most important operational rules without requiring agents to read `DEVTRAIL.md` in full.
25+
26+
## Context
27+
28+
The project was initialized with a complete DevTrail infrastructure including `DEVTRAIL.md` (section 5: Git Operations) and `.devtrail/00-governance/GIT-BRANCHING-STRATEGY.md`. However, `CLAUDE.md` — the primary instruction file for Claude Code — did not include Git workflow rules directly. Since `CLAUDE.md` is always loaded into context, embedding the critical rules there ensures they are always enforced.
29+
30+
## Actions Performed
31+
32+
1. Created branch `docs/initial-claude-md-git-rules` from `main`
33+
2. Added `### Git Operations` section to `CLAUDE.md` between `### Prohibited` and `### Pre-commit Checklist`
34+
3. Section includes: no-main rule, branch prefixes, conventional commits, and a reference to the full strategy document
35+
36+
## Modified Files
37+
38+
| File | Lines Changed (+/-) | Change Description |
39+
|------|--------------------|--------------------|
40+
| `CLAUDE.md` | +7/-0 | Added Git Operations section with branch workflow rules |
41+
42+
## Decisions Made
43+
44+
- Chose a compact summary format (4 lines + reference) over duplicating the full branching strategy. This keeps `CLAUDE.md` concise while ensuring the critical rules are always visible.
45+
46+
## Impact
47+
48+
- **Functionality**: N/A
49+
- **Performance**: N/A
50+
- **Security**: N/A
51+
- **Privacy**: N/A
52+
- **Environmental**: N/A
53+
54+
## Verification
55+
56+
- [x] CLAUDE.md format is correct and section placement is logical
57+
- [x] Rules are consistent with DEVTRAIL.md section 5 and GIT-BRANCHING-STRATEGY.md
58+
- [ ] Manual review performed
59+
60+
## Additional Notes
61+
62+
This is the first AILOG for the arborist-cli project, establishing the documentation trail from the earliest configuration phase.
63+
64+
---
65+
66+
<!-- Template: DevTrail | https://strangedays.tech -->

CLAUDE.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@
2020
### Prohibited
2121
- Never document credentials, tokens, API keys, or PII in document content
2222

23+
### Git Operations
24+
25+
- **NEVER commit directly to `main`** — all changes go through branches + PRs
26+
- Branch prefixes: `feature/`, `feat/`, `fix/`, `hotfix/`, `docs/`, `refactor/`, `test/`
27+
- Use conventional commits: `feat:`, `fix:`, `docs:`, `refactor:`, `chore:`, `test:`, `perf:`
28+
- Full strategy: `.devtrail/00-governance/GIT-BRANCHING-STRATEGY.md`
29+
2330
### Pre-commit Checklist
2431

2532
Before committing, check:

0 commit comments

Comments
 (0)