N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated Typical Git Workflow (markdown)

bunnei 2014-06-13 11:45:26 -07:00
parent 1864dbbf0d
commit f7b8878759
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Typical-Git-Workflow.md

@ -1,14 +1,16 @@
**Terminology** **Terminology**
* `upstream`: Main project repo * `upstream`: Main project repository (https://github.com/citra-emu/citra)
* `origin`: Forked project repo * `origin`: Your GitHub forked project repository (e.g. https://github.com/bunnei/citra)
**Before you begin** **Before you begin**
* Fork the project on GitHub * GitHub fork the project
* Clone your fork locally * Clone your GitHub fork locally
* `git clone https://github.com/your-username/citra.git` * `git clone https://github.com/your-username/citra.git`
* Set your `upstream` to the main project repository
* `git remote add upstream https://github.com/citra-emu/citra.git`
**Create a new branch** **Create a new branch**
* Update `local/master` with `upstream/master` (if it's not a brand new fork) * Update your local `master` with `upstream/master` (if it's not a brand new GitHub fork)
* `git checkout master` * `git checkout master`
* `git pull upstream/master` * `git pull upstream/master`
* Update origin/master with `upstream/master` if you’d like * Update origin/master with `upstream/master` if you’d like