Getting Git to Acknowledge Previously Moved Files

Question

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. Is there a way to do this other than removing old and adding the new (and thus losing the history), or redoing all the changes with git-mv?

Answer 1

To have git remove files that are removed or moved already, just enter

git add -u