2,231
edits
 |
Progress Continues
We've already had 21549 updates since Dolphin 5.0. Keep up with Dolphin's continuing progress through the Dolphin Blog: February, March, and April 2024 Dolphin Progress Report. |
 |
The Dolphin Emulator Wiki needs your help! Dolphin can play thousands of games, and changes are happening all the time. Help us keep up! Join in and help us make this the best resource for Dolphin. |
Git: Difference between revisions
m
→Introduction: fetch+merge -> pull
m (add to Development category) |
m (→Introduction: fetch+merge -> pull) |
||
| (One intermediate revision by the same user not shown) | |||
| Line 1: | Line 1: | ||
== Introduction == | == Introduction == | ||
If you have never used [http://git-scm.com/ Git] before, here is a quick intro to get you started | If you have never used [http://git-scm.com/ Git] before, here is a quick intro to get you started. For Dolphin-specific workflows, read the [[Contributor's Guide]]. | ||
First, set up Git: | First, set up Git: | ||
| 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 | git remote -v # show remotes, you have two now (origin and upstream) | ||
git checkout master # make sure you are on the master branch | |||
git checkout master | git pull --ff-only upstream # pull in new commits from upstream | ||
git | |||
</pre> | </pre> | ||
| Line 47: | Line 46: | ||
</pre> | </pre> | ||
It may be useful to know that Git branches are actually just labelled pointers into the commit graph. | It may be useful to know that Git branches are actually just labelled pointers into the commit graph. | ||
[[Category:Development]] | [[Category:Development]] | ||