While reading Mastodon today there a toot-storm by Frank Wiles that had one post that lifted a mental load I didn't know I was carrying
Don't stress about git history and commit messages. Yes make them as clear as possible, but I have yet to see a perfect git history solve any problem anywhere.