Git is just your ordinary overly complicated* version control system. I'm really great at doing stuff with git even things I didn't intend! :)

Here's a useful collection of ways to get yourself out of your own self-created git jams.

git status

And near the top of the output are instructions.

Warning: there is no confirmation prompt! Don't type this unless you really mean bring your local copy back in sync with the current branch!

git checkout .

From stackoverflow.

  git reset <path-to-file-or-dir>

*Compared to other version control systems.