summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/AGENTS.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/common/AGENTS.md b/common/AGENTS.md
index 24690c0..44d4a94 100644
--- a/common/AGENTS.md
+++ b/common/AGENTS.md
@@ -31,6 +31,9 @@ Both are NixOS, configured by the flake in `nixos-config`.
### Git
+- Always work on a branch, never commit directly to `main`. Committing to
+ `main` lets it diverge from `origin/main` and turns the next pull into a
+ rebase-conflict mess; a branch keeps `main` clean to fast-forward.
- Trailers: `Assisted-by: AGENT_NAME:MODEL_VERSION`. Do NOT use `Co-authored-by`.
- Commit subjects: `area: imperative summary` (e.g. `profiles: extract shared
sandbox profile`); the body explains why, not what.