diff options
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r-- | CONTRIBUTING.md | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8f0ba112..ff2b8b5e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md | |||
@@ -5,6 +5,25 @@ successful with your contribution if you visit the [IRC | |||
5 | channel](http://webchat.freenode.net/?channels=sway&uio=d4) upfront and discuss | 5 | channel](http://webchat.freenode.net/?channels=sway&uio=d4) upfront and discuss |
6 | your plans. | 6 | your plans. |
7 | 7 | ||
8 | ## Pull Requests | ||
9 | |||
10 | If you already have your own pull request habits, feel free to use them. If you | ||
11 | don't, however, allow me to make a suggestion: feature branches pulled from | ||
12 | upstream. Try this: | ||
13 | |||
14 | 1. Fork sway | ||
15 | 2. Clone your fork | ||
16 | 3. git remote add upstream git://github.com/SirCmpwn/sway.git | ||
17 | |||
18 | You only need to do this once. You're never going to use your fork's master | ||
19 | branch. Instead, when you start working on a feature, do this: | ||
20 | |||
21 | 1. git fetch upstream | ||
22 | 2. git checkout -b add-so-and-so-feature upstream/master | ||
23 | 3. work | ||
24 | 4. git push -u origin add-so-and-so-feature | ||
25 | 5. Make pull request from your feature branch | ||
26 | |||
8 | ## Coding Style | 27 | ## Coding Style |
9 | 28 | ||
10 | Sway is written in C. The style guidelines is [kernel | 29 | Sway is written in C. The style guidelines is [kernel |