Harkening back to my early days of git, I have a rough guess as to what you can do to fix that. If all you want is remote master,

  git stash
  git checkout master
  git stash
  git fetch origin
  git reset --hard origin/master

and maybe a 'git rm -r --cached .' in case you have staged files you didn't intend to which stash failed to drop.