From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 13 Dec 2020 18:28:26 +0000 (+0100)
Subject: developer-manual: Mention that merges into 'master' should be avoided
X-Git-Tag: v_3_0_30~270^2~7
X-Git-Url: http://www.privoxy.org/gitweb/-%22http:/sourceforge.net/static/git-logo.png?a=commitdiff_plain;h=4350ad82876c330253c061713441b69fe0108d2b;p=privoxy.git

developer-manual: Mention that merges into 'master' should be avoided
---

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.