2014-11-04 02:56:35 +00:00
|
|
|
# Contribute to Spacemacs
|
|
|
|
|
|
|
|
|
|
<!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc/generate-toc again -->
|
|
|
|
|
**Table of Contents**
|
|
|
|
|
|
|
|
|
|
- [Contribute to Spacemacs](#contribute-to-spacemacs)
|
|
|
|
|
- [Pull Request Guidelines](#pull-request-guidelines)
|
|
|
|
|
- [Submitting a contribution layer upstream](#submitting-a-contribution-layer-upstream)
|
|
|
|
|
|
|
|
|
|
<!-- markdown-toc end -->
|
|
|
|
|
|
|
|
|
|
## Pull Request Guidelines
|
|
|
|
|
|
2014-11-15 03:30:22 +00:00
|
|
|
`Spacemacs` branch model is inspired from the [git-flow][] model: You'll have
|
|
|
|
|
to submit your contributions and fixes within a pull-request to apply against
|
|
|
|
|
the `develop` branch.
|
2014-11-04 02:56:35 +00:00
|
|
|
|
|
|
|
|
_PR = pull request_
|
|
|
|
|
|
|
|
|
|
**Guidelines:**
|
2014-11-04 16:35:07 +00:00
|
|
|
|
|
|
|
|
1) Ideally and for simple PRs:
|
|
|
|
|
|
2014-11-04 02:56:35 +00:00
|
|
|
- branch from `develop` only
|
|
|
|
|
- one topic per PR
|
|
|
|
|
- one commit per PR
|
|
|
|
|
- if you have several commits on different topics, close the PR and create
|
|
|
|
|
one PR per topic
|
|
|
|
|
- if you still have several commits, squash them into only one commit
|
|
|
|
|
- rebase your PR branch on top of upstream `develop` before submitting the PR
|
2014-11-04 16:35:07 +00:00
|
|
|
|
2014-11-11 05:18:43 +00:00
|
|
|
Those PRs are _fast-forwarded_ whenever it's possible and _cherry-picked_
|
|
|
|
|
otherwise.
|
2014-11-04 16:35:07 +00:00
|
|
|
|
|
|
|
|
2) For complex pull requests:
|
|
|
|
|
|
|
|
|
|
- squash only the commits with uninteresting changes like typos, syntax fixes,
|
|
|
|
|
etc... and keep the important steps in different commits.
|
|
|
|
|
|
2014-11-11 05:18:43 +00:00
|
|
|
Those PRs are _merged_.
|
2014-11-04 02:56:35 +00:00
|
|
|
|
|
|
|
|
**Getting Help:**
|
|
|
|
|
If you have any question on this process, join the [gitter chatroom][gitter]
|
2014-11-15 03:30:22 +00:00
|
|
|
and ask your questions there. It will be a pleasure to help you to contribute!
|
2014-11-04 02:56:35 +00:00
|
|
|
|
|
|
|
|
## Submitting a contribution layer upstream
|
|
|
|
|
|
|
|
|
|
It is recommended to join a `README.md` file with your layer, ideally this file
|
|
|
|
|
should document the packages of your layer as well as the key bindings
|
|
|
|
|
associated with them.
|
|
|
|
|
|
|
|
|
|
To submit your contribution layer follow the above
|
|
|
|
|
[guidelines](#pull-request-guidelines) for pull requests.
|
|
|
|
|
|
2014-11-15 03:30:22 +00:00
|
|
|
**Note:** by submitting a configuration layer you become the maintainer of it,
|
|
|
|
|
if you cannot maintain it anymore, no worry but I'll appreciate that you send
|
|
|
|
|
a message to me to warn me.
|
|
|
|
|
|
|
|
|
|
[git-flow]: http://nvie.com/posts/a-successful-git-branching-model/
|
|
|
|
|
[gitter]: https://gitter.im/syl20bnr/spacemacs
|
