[oasisaimlessly]

> But you realize one file doesn't belong in the commit, what do you do? git remove doesn't exist. git rm isn't it either.

"git rm --cached" is exactly what you want, however.