aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTING.md19
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
5channel](http://webchat.freenode.net/?channels=sway&uio=d4) upfront and discuss 5channel](http://webchat.freenode.net/?channels=sway&uio=d4) upfront and discuss
6your plans. 6your plans.
7 7
8## Pull Requests
9
10If you already have your own pull request habits, feel free to use them. If you
11don't, however, allow me to make a suggestion: feature branches pulled from
12upstream. Try this:
13
141. Fork sway
152. Clone your fork
163. git remote add upstream git://github.com/SirCmpwn/sway.git
17
18You only need to do this once. You're never going to use your fork's master
19branch. Instead, when you start working on a feature, do this:
20
211. git fetch upstream
222. git checkout -b add-so-and-so-feature upstream/master
233. work
244. git push -u origin add-so-and-so-feature
255. Make pull request from your feature branch
26
8## Coding Style 27## Coding Style
9 28
10Sway is written in C. The style guidelines is [kernel 29Sway is written in C. The style guidelines is [kernel