From c0a66654bf637da3776ea40272928e5652af09f1 Mon Sep 17 00:00:00 2001 From: David Halter Date: Wed, 17 Oct 2012 07:34:06 +0200 Subject: [PATCH] added Contributing file, because I want people to push to the dev branch. --- CONTRIBUTING.md | 8 ++++++++ jedi | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..27b7c44 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,8 @@ +Pull Requests are great (on the *dev* branch)! + 1. Fork the Repo on github. + 2. If you are adding functionality or fixing a bug, please add a test! + 3. Push to your fork and submit a *pull request to the dev branch*. + +My *master* branch is a 100% stable (should be). I only push to it after I am +certain that it is working. Many people are using Jedi directly from the github +master branch. diff --git a/jedi b/jedi index 6a8b160..2ba5e36 160000 --- a/jedi +++ b/jedi @@ -1 +1 @@ -Subproject commit 6a8b160e1b65db0298bc3581e20099dfa19d25e9 +Subproject commit 2ba5e363c972cbe3f61badfa7443079104263aa3