Have you tried `git add -p`?

There are cases it doesn’t handle well, like if you want something at the bottom of a file with lots of irrelevant changes. And if you want one line but not the line immediately below, then splitting doesn’t work without starting the interactive editor, which can be confusing.