From 717c88ec0f7fff3658a553843cc68ad6cfaf086f Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Thu, 17 Mar 2016 21:16:12 -0600 Subject: [PATCH] Update contributing notes --- CONTRIBUTING.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 346c6dcb9..204f70cf2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,7 +41,9 @@ getting free help. If we helped you, please consider Submit [pull requests](https://github.com/mholt/caddy/pulls) at any time. Make sure to write tests to assert your change is working properly and is thoroughly -covered. +covered. We'll ask most pull requests to be +[squashed](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html), +especially with small commits. ### Proposals, suggestions, ideas, new features @@ -65,6 +67,15 @@ best to open an issue first and "claim" it and get feedback before you invest a lot of time. +### Collaborator status + +If your pull request is merged, congratulations! You're technically a +collaborator. We may also grant you "Collaborator status" which means you can +push to the repository and merge other pull requests. We hope that you will +stay involved by reviewing pull requests, submitting more of your own, and +resolving issues as you are able to. Thanks for making Caddy amazing! + + ### Vulnerabilities If you've found a vulnerability that is serious, please email me: Matthew dot