One of the reasons why git niggles me: I can never remember how to untrack a file. 

git rm —cached filename