paroj
commented
8 years ago something went wrong.
git reset --hard upstream/master should have overwritten all your local history with mine, but you still got the merge commits etc.
You could try cloning my repo again and force pushing which would achieve the same.
Also try to write commit messages similar to what I do when I merge your changes: https://github.com/paroj/gltut/commits/master
also see: http://chris.beams.io/posts/git-commit/
Before fixing the typos, I ran: git fetch git reset --hard upstream/master
Please let me know if that did the correct thing.