One Quickie

---

git "revert" (git->Hacks)

To remove uncommitted changes so you can pull without complaint (revert in svn-speak):

% git checkout  filename-to-revert

This checks the file out from HEAD, removing the local modificaiton. (put -- before the file name in case you have a branch named the same as the file)