summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rules.mdwn13
1 files changed, 13 insertions, 0 deletions
diff --git a/rules.mdwn b/rules.mdwn
index 53810a8c..11c0b7d2 100644
--- a/rules.mdwn
+++ b/rules.mdwn
@@ -63,6 +63,8 @@ Equivalent rules apply.
## Behavior
+### ... on your branches
+
Most branches are to be eventually be merged back into the mainline branch. To
faciliate (and also to help other contributors) we'd like you to write a short
summary log in a top-level (or wherever else appropriate) `ChangeLog.WHATEVER`
@@ -85,3 +87,14 @@ file](http://www.gnu.org/prep/standards/html_node/Change-Logs.html). E.g.,
don't waste time writing *ChangeLog* entries for debugging stuff that will be
removed again before merging back into mainline. But please do write
something. Short notes.
+
+### ... in general
+
+Try to not introduce spurious, unneeded changes, e.g., whitespace changes.
+
+Adhere to the already-used coding conventions. These are usually the [GNU
+Coding Standards](http://www.gnu.org/prep/standards/html_node/) for stuff
+written by ourselves, including new files, of course.
+
+GNU Mach code is largely based on external code. Don't GNU-ify it, as this
+would make merging external patches unnecessarily difficult.