From 81157b31366a7f72545141ba7de82e51f272852c Mon Sep 17 00:00:00 2001 From: "Bradley M. Kuhn" Date: Sat, 20 Dec 2014 17:53:02 -0500 Subject: [PATCH] No instructions for 'master';just note possibility Ultimately, users will probably pick either 'master' or 'next' to submit changes anyway, so just leave the instructions to refer to 'next' and note that they could replace 'next' with 'master'. --- CONTRIBUTING.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3ad832d..a92843e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -86,6 +86,10 @@ are not necessarily rejected. In fact, if your change is a fix for typo, spelling, grammar, formatting or anything urgent, submitting a patch against 'master' may make more sense. +To use the instructions below for proposals against the 'master' branch, just +replace 'next' everywhere below with 'master'. + + ### Contributing via Gitorious First-time contributors may want to do the following four items first: @@ -113,7 +117,6 @@ First-time contributors may want to do the following four items first: $ git remote add copyleft-tutorial-official git@gitorious.org:copyleft-org/tutorial.git $ git fetch copyleft-tutorial-official - $ git branch --track official-master copyleft-tutorial-official/master $ git branch --track official-next copyleft-tutorial-official/next That completes the first-time setup. Next is a workflow each proposed merge