Guide:- Compiling PPSSPP on Windows for Dummies (updated for MSVC 2013)

[solarmystic]

(02-10-2014 07:33 PM)Oblivion Wrote:  @solarmystic
I want to revert changes made by this commit (merge) (causes Dissidia 012 and some other games' speed to drop 30%) and this commit (merge) (causes Dissidia 012 to have a red tint on cutscenes with a light background) and keep everything else intact. Is that possible with git or will I have to make the changes myself?

It is possible to do so.

The proscribed command for those two cases (assuming you're up to date using a git pull and you have NO current modifications to your working ppsspp directory that contains all the source files) would be:-

Code:

git revert --no-edit 2f7243b 09f1c79 60cf5df b48de95 c6dc6b4 9cfb864

Each set of numbers represents the first 7 digits of the SHA-1 commit id for each commit that you wish to revert. Note that we're not reverting the commits that merge them to master, but we're reverting the ones added in by the original authors of the commits themselves.

The commit by Bigpet which introduced the red tint on cutscenes is originally

Code:

2f7243b

There are 5 seperate commits by [Unknown] that make up his pull request which got merged to master and they are

Code:

09f1c79 60cf5df b48de95 c6dc6b4 9cfb864

You can get those details on the "Files" tab of the original pull request for each commit.

If you ever decide to change your mind on the revert and restore the original master back to the way it was, the command as always, is,

Code:

git reset --hard <current master commit id>

since a revert in itself is considered an additional commit that you're pushing to your own repository. Thus resetting the tree would be the easiest way to go back to the original path.