shit that needs to be done

gistfile1.txt

Git Shell is where you will be entering all commands: http://i.imgur.com/rZ7I9Nv.png
Before doing anything listed below you will need to setup "upstream", instructions here: https://help.github.com/articles/configuring-a-remote-for-a-fork/

SYNCING REPOSITORY
1- type "git fetch upstream"
2- type "git merge upstream/1.8-Rewrite"

This will make your repository up to date with the "upstream", aka the original repository we are forked from.

SQUASHING COMMITS
These 5 commits need to be made into one: http://i.imgur.com/TOSOExK.png
1- type "git reset upstream/1.8-Rewrite" http://i.imgur.com/7ehjXDr.png
2- Commit unstaged changes as one commit: http://i.imgur.com/JYBJIUy.png http://i.imgur.com/pDQkeTC.png
3- type "git push --force" http://i.imgur.com/pheei2u.png
4- Press "sync" button

PULL REQUESTS
Pull requests can be done easily from the github desktop client, here's how.
1- Press "pull request" button: http://i.imgur.com/ouTh9FR.png
2- Select where you want to send the pull request, in this case it's the original repo's 1.8-Rewrite branch: http://i.imgur.com/5Gay7qy.png
3- Describe pull request: http://i.imgur.com/LmoLeJA.png
4- Press "send pull request"
5- View PR on github: http://i.imgur.com/Ft9KYSG.png https://github.com/WayofTime/BloodMagic/pull/588

That is all.