Merge pull request #424 from jwpage/contributing_master

Change branch names from "master" to "gh-pages".
This commit is contained in:
Phil Sturgeon
2014-08-21 22:45:35 -04:00

View File

@@ -51,8 +51,8 @@ included in the project:
2. If you cloned a while ago, get the latest changes from upstream: 2. If you cloned a while ago, get the latest changes from upstream:
```bash ```bash
git checkout master git checkout gh-pages
git pull upstream master git pull upstream gh-pages
``` ```
3. Create a new topic branch (off the main project development branch) to 3. Create a new topic branch (off the main project development branch) to
@@ -73,7 +73,7 @@ included in the project:
6. Locally merge (or rebase) the upstream development branch into your topic branch: 6. Locally merge (or rebase) the upstream development branch into your topic branch:
```bash ```bash
git pull [--rebase] upstream master git pull [--rebase] upstream gh-pages
``` ```
7. Push your topic branch up to your fork: 7. Push your topic branch up to your fork: