From b34102cd11f30b4daaca36b51c4493165472eafd Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Fri, 26 Sep 2014 09:50:56 +0200 Subject: [PATCH] Add note about squashing/rebasing --- CONTRIBUTING.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 68477ef22..a8abb8551 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,6 +39,17 @@ attention. In general, any open issues are fair game! Be prepared for a review](https://discourse.syncthing.net/t/733); it's all in the name of quality. :) +You may be asked to "rebase" or "squash" your pull request before it's +accepted. This means to make sure that the pull request: + + - Is based on the latest commit on `master`. + + - Only contains a single commit (exceptions to be made where + appropriate). + + - Has a descriptive commit message, ending in `(fixes #123)` if it + resolves an existing issue. + ## Licensing All contributions are made under the same MIT License as the rest of the