projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0ceccf0
)
developer-manual: Mention that merges into 'master' should be avoided
author
Fabian Keil
<fk@fabiankeil.de>
Sun, 13 Dec 2020 18:28:26 +0000
(19:28 +0100)
committer
Fabian Keil
<fk@fabiankeil.de>
Mon, 14 Dec 2020 07:49:17 +0000
(08:49 +0100)
doc/source/developer-manual.sgml
patch
|
blob
|
history
diff --git
a/doc/source/developer-manual.sgml
b/doc/source/developer-manual.sgml
index
2c32912
..
43bf7be
100644
(file)
--- 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.