From d2ef7498dd10bc51f81f196787f956243fd01de3 Mon Sep 17 00:00:00 2001
From: Bert-Jan Fikse <bert-jan@whatwedo.ch>
Date: Fri, 12 Sep 2025 14:49:43 +0200
Subject: [PATCH] chore: add contribution guidelines for git

---
 README.md           |  5 +++++
 contributing/git.md | 48 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 contributing/git.md

diff --git a/README.md b/README.md
index 1dde726..749d311 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,11 @@ This repository contains documentation, guides, and reference material.
 
 ## 📖 Available Documentation
 
+- **[Contribution guidelines](./contributing/)**  
+  Documentation and guides related to infrastructure configuration and best practices.  
+  - [Git](./infrastructure/git.md)  
+    Guidelines for contributing using git
+
 - **[Infrastructure](./infrastructure/)**  
   Documentation and guides related to infrastructure configuration and best practices.  
   - [ACME](./infrastructure/acme.md)  
diff --git a/contributing/git.md b/contributing/git.md
new file mode 100644
index 0000000..90624c4
--- /dev/null
+++ b/contributing/git.md
@@ -0,0 +1,48 @@
+# Contributing Guidelines
+
+Thank you for your interest in contributing! Please follow these rules to keep our history clean and reviews smooth.
+
+---
+
+## 📝 Commit Guidelines
+
+### **Sign your commits**  
+  All commits **must** be signed (`git commit -S`) so they show up as **Verified** in Forgejo.
+
+### **Use Conventional Commit types**  
+  Format:
+  ```text
+  <type>(<scope>): <short description>
+  
+  <long description>
+  ```
+
+Allowed types:
+- `feat` - a new feature
+- `fix` - a bug fix
+- `chore` - maintenance, tooling, docs, CI, etc.
+
+Examples:
+- `feat(auth): add JWT-based login`
+- `fix(api): correct null pointer on user lookup`
+- `chore(ci): update Forgejo Actions workflow`
+
+### **Commit body for complex changes**  
+If the change is non-trivial:
+- Explain *what* and *why* in the body.
+- Reference issues with `closes #123` or `refs #123`.
+
+---
+
+## 🔀 Pull Requests (PRs)
+
+### **Review required**  
+Every PR must be reviewed and approved by **at least one other contributor** before merging.
+
+### **Branching**  
+- Use feature branches: `feature/<name>`, `fix/<name>`, etc.  
+- Keep PRs focused and avoid mixing unrelated changes.
+
+### **Commit history**  
+- Rebase/squash before merging if necessary.
+- Keep commits meaningful and clean.