To remove a file from the staged area after adding it (but before a commit), type git add --interactive and use the "revert" option.
git add --interactive