Not to forget git gui, that allow you to pick lines to commit instead of the whole file