Is there a way to do a git pull that ignores any local file changes without blowing the directory away and having to perform a git clone?
git pull
git clone
This will fetch the current branch and attempt to do a fast forward to master:
git fetch && git merge --ff-only origin/master