This looks horrible IMHO. I agree changes to main should be kept small. But not too small. They should be coherent 'chunks' of functionality, even if they are

This looks horrible IMHO. I agree changes to main should be kept small. But not too small. They should be coherent 'chunks' of functionality, even if they are not yet a fully working feature. Committing to a dedicated separate branch, quite apart from protecting against fat-finger commits etc, keeps everything together, allows for easy code review of a complete, coherent change, etc.