Given the case I made two independent changes in one file: eg. added a new method and changed another method.
I often don\'t want to commit
It's a little riskier than Spike's full suggestion but can be easier to do. Also make sure you try it on something else first as some editors will refuse to save over a file that has changed out from under them unless you reload that file (losing all your changes)