This kind of error raises an interesting challenge for this approach to commits. The commit this came from is further down in the commit history, so either:

1.  It stands as its own commit, e.g. "review fixes", which I don't particularly like
2.  The source commit gets cherry-picked to be more recent in the commit history, and the fix commit is squashed into it.

I wonder what tools are available to make this kind of manipulation of diffs and commit history easier?