HACKING: Add notes on coding style and making pull requests

1 files changed, 58 insertions, 0 deletions

diff --git a/HACKING.md b/HACKING.md
index 3fc9016..20ccb31 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -57,6 +57,64 @@ Dependencies
 * appindicator (Optional, for Ubuntu-style GUI status icon)
 
 
+Coding style
+------------
+
+Redshift follows roughly the Linux coding style
+<http://www.kernel.org/doc/Documentation/CodingStyle>. Some specific rules to
+note are:
+
+* Lines should not be much longer than 80 chars but this is not strictly
+  enforced. If lines are much longer than this the code could likely be improved
+  by moving some parts to a smaller function.
+* All structures are typedef'ed.
+* Avoid Yoda conditions; they make the logic unnecessarily hard to comprehend.
+* Avoid multiline if-statements without braces; either use a single line or add
+  the braces.
+
+
+Creating a pull request
+-----------------------
+
+1. Create a topic branch for your specific changes. You can base this off the
+   master branch or a specific version tag if you prefer (`git co -b topic master`).
+2. Create a commit for each logical change on the topic branch. The commit log
+   must contain a one line description (max 80 chars). If you cannot describe
+   the commit in 80 characters you should probably split it up into multiple
+   commits. The first line can be followed by a blank line and a longer
+   description (split lines at 80 chars) for more complex commits. If the commit
+   fixes a known issue, mention the issue number in the first line (`Fix #11:
+   ...`).
+3. The topic branch itself should tackle one problem. Feel free to create many
+   topic branches and pull requests if you have many different patches. Putting
+   them into one branch makes it harder to review the code.
+4. Push the topic branch to Github, find it on github.com and create a pull
+   request to the master branch. If you are making a bug fix for a specific
+   release you can create a pull request to the release branch instead
+   (e.g. `release-1.9`).
+5. Discussion will ensue. If you are not prepared to partake in the discussion
+   or further improve your patch for inclusion, please say so and someone else
+   may be able to take on responsibility for your patch. Otherwise we will
+   assume that you will be open to critisism and suggestions for improvements
+   and that you will take responsibility for further improving the patch. You
+   can add further commits to your topic branch and they will automatically be
+   added to the pull request when you push them to Github.
+6. You may be asked to rebase the patch on the master branch if your patch
+   conflicts with recent changes to the master branch. However, if there is no
+   conflict, there is no reason to rebase. Please do not merge the master back
+   into your topic branch as that will convolute the history unnecessarily.
+7. Finally, when your patch has been refined, you may be asked to squash small
+   commits into larger commits. This is simply so that the project history is
+   clean and easy to follow. Remember that each commit should be able to stand
+   on its own, be able to compile and function normally. Commits that fix a
+   small error or adds a few comments to a previous commit should normally just
+   be squashed into that larger commit.
+
+If you want to learn more about the Git branching model that we use please see
+<http://nvie.com/posts/a-successful-git-branching-model/> but note that we use
+the `master` branch as `develop`.
+
+
 Creating a new release
 ----------------------