From 765ff4b67be3d34aed40cdaf3319f24d8792dbe7 Mon Sep 17 00:00:00 2001 From: Andreas Rumpf Date: Thu, 27 Jun 2019 21:28:53 +0200 Subject: [PATCH] contributing.rst guide: Make the rules reflect the reality. --- doc/contributing.rst | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/contributing.rst b/doc/contributing.rst index 6d13fd5951..8699002ae2 100644 --- a/doc/contributing.rst +++ b/doc/contributing.rst @@ -349,8 +349,13 @@ General commit rules -------------------- 1. The commit message should contain either ``[bugfix]`` or ``[feature]`` - or ``[refactoring]`` or ``[other]``. Refactorings and bugfixes and "other" - are backported to the latest stable release branch (currently 0.20.x). + or ``[refactoring]`` or ``[other]``. In practice however this is very + often forgotten and a commit message like ``fixes #xyz`` is good enough. + + Every commit is backported unless + tagged with either ``[feature]`` or with ``[nobackport]``. They are + backported to the latest stable release branch (currently 0.20.x). + Refactorings are backported because they often enable further bugfixes. 2. If you introduce changes which affect backwards compatibility,