I\'ve moved a bunch of files around manually without thinking, and can\'t find a way to get git to recognize that the files are just moved and not actually different files.
To have git remove files that are removed or moved already, just enter
git add -u