Github:correct update source

[sum2012]

git remote add upstream https://github.com/hrydgard/ppsspp.git
git fetch upstream
git rebase upstream/master
git submodule update --init

Will make a lot of change.
Please help

[[Unknown]]

That's the right way. It reapplies your changes. What problems are you having, is it trying to apply a lot of changes on top of it after rewinding?

-[Unknown]

[sum2012]

[Unknown] Yes

[[Unknown]]

Probably you've been merging prior to that, which makes things a bit complicated. What I do is use cherry-pick. Like this:

(where my-branch = master if you're not using a separate branch)

git log --oneline upstream/master...my-branch
< take note of the sha1s that matter>
git checkout -b new-branch upstream/master
git cherry-pick <list of sha1s that matter>

For example, the first command currently gives me this output:

cbd66b5 Make async IO actually wait for completion.
d87734f sceIoRead() always reschedules, and handle async.
0498eee sceIoLseek() should sign extend error codes.
95b8a6d Correctly notify callbacks on sceIoCloseAsync().
efbe929 Tests show async result is a sign-extended s64.
15c714f Start with sceIoOpenAsync() cleaning up async io.

So then I would use:

git cherry-pick cbd66b5 d87734f 0498eee 95b8a6d efbe929 15c714f

If you have any commits from other people / merge commits / stuff you don't want, skip them.

-[Unknown]