Git: Difference between revisions

104 bytes removed ,  12 April 2014
m
→‎Introduction: fetch+merge -> pull
m (move contributor's guide link to the top)
m (→‎Introduction: fetch+merge -> pull)
 
Line 28: Line 28:
<pre>
<pre>
git remote add upstream https://github.com/dolphin-emu/dolphin.git # add a separate remote for the main repository
git remote add upstream https://github.com/dolphin-emu/dolphin.git # add a separate remote for the main repository
git remote -v                       # now you have two remotes (origin and upstream)
git remote -v               # show remotes, you have two now (origin and upstream)
git fetch upstream                  # update your clone
git checkout master         # make sure you are on the master branch
git checkout master                 # make sure you are on the master branch
git pull --ff-only upstream # pull in new commits from upstream
git merge --ff-only upstream/master # fast-forward to the newest commit of the remote upstream branch
</pre>
</pre>


2,231

edits