Was with you for the first half. For me it's lots of XXX commits to save work in progress, followed by a `git reset <base>` and several passes of `git add -p`

Was with you for the first half. For me it's lots of XXX commits to save work in progress, followed by a `git reset <base>` and several passes of `git add -p` to build up a set of reasonable standalone commits.