git add -p is the worst.