Use reset HEAD to unstage files, rm --cached only applies on initial commit