From 4350ad82876c330253c061713441b69fe0108d2b Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 13 Dec 2020 19:28:26 +0100
Subject: [PATCH] developer-manual: Mention that merges into 'master' should be
avoided
---
doc/source/developer-manual.sgml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index 2c32912e..43bf7be2 100644
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -188,6 +188,10 @@ Hal.
such changes are fully tested ought they be pushed back to the central
repository master branch.
</para>
+ <para>
+ Before pushing stuff, please rebase it on a current master so we get
+ an uncomplicated commit history. Avoid merges where possible.
+ </para>
<!--
<para>
Branches are used to fork a sub-development path from the main trunk.
--
2.49.0