Git /Distributed Version Control/

# remove some.file from index, but keep the file itself untouched
git rm --cached some.file
# remove some.file from both the index and the working directory
git rm some.file