From f7b887875983d3623b1bce4bcbb5e1d6d54adead Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 13 Jun 2014 11:45:26 -0700 Subject: [PATCH] Updated Typical Git Workflow (markdown) --- Typical-Git-Workflow.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Typical-Git-Workflow.md b/Typical-Git-Workflow.md index e5fdc05..8b675de 100644 --- a/Typical-Git-Workflow.md +++ b/Typical-Git-Workflow.md @@ -1,14 +1,16 @@ **Terminology** -* `upstream`: Main project repo -* `origin`: Forked project repo +* `upstream`: Main project repository (https://github.com/citra-emu/citra) +* `origin`: Your GitHub forked project repository (e.g. https://github.com/bunnei/citra) **Before you begin** -* Fork the project on GitHub -* Clone your fork locally +* GitHub fork the project +* Clone your GitHub fork locally * `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** -* 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 pull upstream/master` * Update origin/master with `upstream/master` if you’d like