ProjectSkyfire/SkyFireEMU_rebase — comment on commit 57cbce146382b00058477d95256f3deb7ed2ff7d
File:  line 0
By Fredi:

I forgot to mention that you must use those two commands instead of "git pull origin master", cause git pull fetches and merges the remote branch with your local one, that's exactly why "Merge branch 'master' of github.com:ProjectSkyfire/SkyFireEMU_rebase" happens :P