aboutsummaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorJakob Borg <jakob@nym.se>2014-12-02 15:55:45 +0100
committerJakob Borg <jakob@nym.se>2014-12-02 15:55:45 +0100
commitc922c4c3830e9c71739b0fd7649a97cc8ce34402 (patch)
treefb7ef26b30fe0b6ef89086611ac0eca55cec89ad /CONTRIBUTING.md
parenta8ba7786ae91674ad0175b9eddf51fb6ea2cc784 (diff)
downloadsyncthing-c922c4c3830e9c71739b0fd7649a97cc8ce34402.tar.gz
syncthing-c922c4c3830e9c71739b0fd7649a97cc8ce34402.zip
Clarify/formalize contribution policy and commit access
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md18
1 files changed, 17 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c5c9e61db..95a0c0876 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -37,6 +37,22 @@ where to start, any open issues are fair game! Be prepared for a
all in the name of quality. :) Following the points below will make this
a smoother process.
+Individuals making significant and valuable contributions are given
+commit-access to the project. If you make a significant contribution and
+are not considered for commit-access, please contact any of the
+Syncthing core team members.
+
+All nontrivial contributions should go through the pull request
+mechanism for internal review. Determining what is "nontrivial" is left
+at the discretion of the contributor.
+
+### Core Team
+
+The Syncthing core team currently consists of the following members;
+
+ - Jakob Borg (@calmh)
+ - Audrius Butkevicius (@AudriusButkevicius)
+
## Coding Style
- Follow the conventions laid out in [Effective Go](https://golang.org/doc/effective_go.html)
@@ -59,7 +75,7 @@ a smoother process.
feature should probably be a single commit based on the current
`master` branch. You may be asked to "rebase" or "squash" your pull
request to make sure this is the case, especially if there have been
- amendments during review.
+ amendments during review.
## Licensing