Git Pull While Ignoring Local Changes?

Question

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?

Answer 1

Look at git stash to put all of your local changes into a "stash file" and revert to the last commit. At that point, you can apply your stashed changes, or discard them.