Post

dammit, if this doesn't work
git reset --hard HEAD && git stash && git pull
then I'm going to
fdisk && git pull