Right, gitignore can only help with untracked files, not tracked and changed.

Back in the day when I was using SVN, its ignore-on-commit feature (GUI only, but anyway) was incredibly useful.