How to remove a file from the index ( = staging area = cache) without removing it from the file system?
git rm --cached [file]
If you omit the
--cached option, it will also delete it from the working tree.
git rm is slightly safer than
git reset, because you'll be warned if the staged content doesn't match either the tip of the branch or the file on disk. (If it doesn't, you have to add