Routinely, in order to reorder some details of a Git repo, I used the interactive rebase many times. In general I do many small modifications and at the end squashed them in