[tigerlily]

I do this, and with TortoiseGit I just pick and choose the good bits and put them as atomic changes in their own branches and PRs.