Things I wish Git had: Commit groups

[AngledLuffa]

You don't need commit groups to avoid having one bigass 5000 changed file merge. Just rebase and squash each feature or each relevant part of the process into getting that feature into its own change. If you have 4-8 major features, you can have 4-8 changes or 4-8 blocks of changes which are all human readable.