06-08-2013, 08:38 PM
Running all these should give you a pristine state again:
git clean -dfx
git submodule foreach git clean -dfx
git reset --hard HEAD
git pull origin master (run this if you want the latest)
git submodule update --init --recursive
git clean -dfx
git submodule foreach git clean -dfx
git reset --hard HEAD
git pull origin master (run this if you want the latest)
git submodule update --init --recursive