tell you some files changes
git status
now revert back to the head with the changes that weren't commited
git checkout path/to/file.txt
run git status again and make sure there is nothing left
git status
now you can pull from origin
git pull origin master