3 ms·

`git add -p` should do it. git works great by "patches", not necessarily by "files", so what you are saying is supported out of the box really well.