fixes to coding instructions in contributing

This commit is contained in:
Stephen Birarda 2014-03-05 16:24:19 -08:00
parent 4857268ab7
commit 3afbdabd66

View file

@ -6,10 +6,12 @@ Contributing
=== ===
1. Fork the repository to your own GitHub account. 1. Fork the repository to your own GitHub account.
2. Clone your fork of the repository locally 2. Clone your fork of the repository locally
``` ```
git clone git://github.com/USERNAME/hifi.git git clone git://github.com/USERNAME/hifi.git
``` ```
3. Create a new branch 3. Create a new branch
``` ```
git checkout -b new_branch_name git checkout -b new_branch_name
``` ```
@ -18,6 +20,7 @@ Contributing
5. Commit 5. Commit
* Use [well formed commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) * Use [well formed commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
6. Update your branch 6. Update your branch
``` ```
git remote add upstream https://github.com/highfidelity/hifi git remote add upstream https://github.com/highfidelity/hifi
git pull upstream master git pull upstream master
@ -25,6 +28,7 @@ Contributing
Resolve any conflicts that arise with this step. Resolve any conflicts that arise with this step.
7. Push to your fork 7. Push to your fork
``` ```
git push origin master git push origin master
``` ```