[newdak/master] Remove changelog file, adjust CodingStyle part about the merge tree. Signed-off-by: Joerg Jaspert <email@example.com>
ChangeLog | 4 ----
CodingStyle.txt | 15 ++++++++++++---
2 files changed, 12 insertions(+), 7 deletions(-)
delete mode 100644 ChangeLog
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
@@ -1,4 +0,0 @@
-2008-08-30 Joerg Jaspert <firstname.lastname@example.org>
- * feature.txt: Added *initial* and very uncomplete version.
diff --git a/CodingStyle.txt b/CodingStyle.txt
index 4678275..ccd4f45 100644
@@ -18,12 +18,21 @@ Code related:
- Look at / read http://www.python.org/dev/peps/pep-0008/
- History rewriting is considered bad.
- Always have a "Signed-off-by" line in your commit.
-- If you merge from others (fine), please use mergeoptions = --no-ff --no-commit
- We want to see who actually merged the code.
+- If you merge from others (fine), please use a seperate merge tree for
+ it, which you setup in your .git/config similar to
+ [branch "merge"]
+ mergeoptions = --no-ff --no-commit
+ We want to see who actually merged the code. When you are done merging
+ in that seperate tree (and committed) it and are happy to have it in
+ the main code - merge it over to master (which ideally is a
+ fastforward) and push it up.
+- Write good, meaningful, commit messages!