My first thought was 'oh no, not yet another git command!" but I get where the author is coming from. However, the dangerous part is including a refactor in an

My first thought was 'oh no, not yet another git command!" but I get where the author is coming from. However, the dangerous part is including a refactor in an unrelated change. Good luck backing that out if you need to. Personally, when I'm in this situation I just park what was supposed to be doing and then do the refactor separately. It helps reviewers and is more transparent.