aboutsummaryrefslogtreecommitdiffstats
path: root/CONTRIBUTE
diff options
context:
space:
mode:
authorJan D2015-05-23 12:28:54 +0200
committerJan D2015-05-23 12:28:54 +0200
commit6aaa489dc112f51f6045f79b37cb78dd513e398f (patch)
treea34eb6ad435ab877848f7464374570549ca55ec5 /CONTRIBUTE
parentee14727ce033bae3bc11af35e7843604e5a5e635 (diff)
parent7ac84a2570e1268cc040fcd529508307b2b22c01 (diff)
downloademacs-6aaa489dc112f51f6045f79b37cb78dd513e398f.tar.gz
emacs-6aaa489dc112f51f6045f79b37cb78dd513e398f.zip
Merge branch 'master' into cairo
Diffstat (limited to 'CONTRIBUTE')
-rw-r--r--CONTRIBUTE3
1 files changed, 3 insertions, 0 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE
index bf231554261..7e697ddd89a 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -96,6 +96,9 @@ messages:
96- Commit messages should not contain the "Signed-off-by:" lines that 96- Commit messages should not contain the "Signed-off-by:" lines that
97 are used in some other projects. 97 are used in some other projects.
98 98
99- Any lines of the commit message that start with "; " are omitted
100 from the generated ChangeLog.
101
99- Explaining the rationale for a design choice is best done in comments 102- Explaining the rationale for a design choice is best done in comments
100 in the source code. However, sometimes it is useful to describe just 103 in the source code. However, sometimes it is useful to describe just
101 the rationale for a change; that can be done in the commit message 104 the rationale for a change; that can be done in the commit message