Copyleft/guide
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

No instructions for 'master';just note possibility

Browse source 
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'.
This commit is contained in:
Bradley M. Kuhn 2014-12-20 17:53:02 -05:00
parent ea09b83e00
commit 81157b3136
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CONTRIBUTING.md
View file

@ -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 spelling, grammar, formatting or anything urgent, submitting a patch against
'master' may make more sense. '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 ### Contributing via Gitorious
First-time contributors may want to do the following four items first: 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 remote add copyleft-tutorial-official git@gitorious.org:copyleft-org/tutorial.git
$ git fetch copyleft-tutorial-official $ git fetch copyleft-tutorial-official
$ git branch --track official-master copyleft-tutorial-official/master
$ git branch --track official-next copyleft-tutorial-official/next $ git branch --track official-next copyleft-tutorial-official/next
That completes the first-time setup. Next is a workflow each proposed merge That completes the first-time setup. Next is a workflow each proposed merge