summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Purcell <steve@sanityinc.com>2015-01-11 11:03:39 +0000
committerSteve Purcell <steve@sanityinc.com>2015-01-11 11:03:39 +0000
commite0ccd3209af5485dcdf49052b2f5535257eff179 (patch)
treec17de2a925f5285b9d439396e6d048770dc2fca7
parentce903c1a5e1275dbb7a2dba58c8a3eccd5a8f034 (diff)
parent0bb32bb8fad2167285ea220cf604225f5ed7d0f5 (diff)
downloadfork-ledger-e0ccd3209af5485dcdf49052b2f5535257eff179.tar.gz
fork-ledger-e0ccd3209af5485dcdf49052b2f5535257eff179.tar.bz2
fork-ledger-e0ccd3209af5485dcdf49052b2f5535257eff179.zip
Merge branch 'master' into next
-rw-r--r--CONTRIBUTING.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..a4b8b14f
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,8 @@
+Tips for contributors
+---------------------
+
+* Please **make pull requests against `next`, not `master`**.
+ Ledger follows a [git-flow](http://nvie.com/posts/a-successful-git-branching-model/) branching model,
+ in which development happens on the `next` branch and is subsequently merged into `master` for releases.
+* If you're making **changes to `ledger-mode`, or other files for which the Travis build is not
+ relevant**, please **add `[ci skip]` to the end of the commit message**.