diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 95d9c8069..947c0362b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -40,9 +40,11 @@ Steps to reproduce the behavior:
 
 ## Current configuration
 
+<!-- You can write "N/A" for the items that sound irrelevant to you -->
 * OS name (and version): 
 * Browser name (and version): 
 * `learn-ocaml --version`: 
+* `git describe --long --always --abbrev=40`: 
 
 ## Additional context
 
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 01c0e2aed..5a45061be 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -28,9 +28,11 @@ assignees: ''
 
 ## Current configuration
 
+<!-- You can write "N/A" for the items that sound irrelevant to you -->
 * OS name (and version): 
 * Browser name (and version): 
 * `learn-ocaml --version`: 
+* `git describe --long --always --abbrev=40`: 
 
 ## Additional context
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 41596d670..d74c1c63f 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -28,3 +28,4 @@
 * Read [this wiki page](https://github.com/ocaml-sf/learn-ocaml/wiki/Checklist-for-testing-and-merging-a-PR)
 * Make sure the PR has a milestone
 * Assign yourself before merging
+* We can squash-merge 1-commit PRs (use a header with a [conventional-commit type](https://github.com/ocaml-sf/learn-ocaml/blob/master/CONTRIBUTING.md#conventional-commits-examples), add a footer with `Fix #…` if need be)