When doing this kind of in-work fixes, I use "add -p" to make an independent commit only of that specific change. Later with "rebase -i" I move all such commit

When doing this kind of in-work fixes, I use "add -p" to make an independent commit only of that specific change. Later with "rebase -i" I move all such commits at the start of the branch, and in case deploy them with an earlier merge.