diff options
| author | Jakob Borg <jakob@nym.se> | 2014-09-26 09:50:56 +0200 |
|---|---|---|
| committer | Jakob Borg <jakob@nym.se> | 2014-09-26 09:57:16 +0200 |
| commit | b34102cd11f30b4daaca36b51c4493165472eafd (patch) | |
| tree | ab3d918327bf9ade27f7995dbc56f927dea93c9e /CONTRIBUTING.md | |
| parent | 3c51cd66269ea14d0b7df50d22356e150eabd203 (diff) | |
| download | syncthing-b34102cd11f30b4daaca36b51c4493165472eafd.tar.gz syncthing-b34102cd11f30b4daaca36b51c4493165472eafd.zip | |
Add note about squashing/rebasing
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 11 |
1 files changed, 11 insertions, 0 deletions
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 |