OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-15 01:40:05 +00:00
Code Issues Projects Releases Wiki Activity

Updated Typical Git Workflow (markdown)

bunnei 2014-06-13 12:25:50 -07:00
parent 0eb49256cf
commit 2b1ae8b320
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Typical-Git-Workflow.md

@ -14,10 +14,10 @@ This is a guide to a typical Git workflow with Citra. It covers forking from the
**Create a new branch** **Create a new branch**
* Update your local `master` with `upstream/master` (if it's not a brand new GitHub 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 fetch upstream && git rebase origin/master` or the equivalent `git pull upstream/master --rebase` (Note: `git pull upstream/master` is incorrect and may result in an undesired merge commit)
* Update origin/master with `upstream/master` if you’d like * Update origin/master with `upstream/master`, if you’d like
* `git push origin/master` * `git push origin/master`
* Create your branch from the latest master * Create your branch from the latest master (Note: please format-branch-names-like-this)
* `git checkout -b new-branch-name` * `git checkout -b new-branch-name`
* Push your new branch to origin if you'd like * Push your new branch to origin if you'd like
* `git push origin new-branch-name` * `git push origin new-branch-name`