New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/34683#issuecomment-1001599337 Comment: Just `git commit --amend` is enough for most cases, to avoid making a new commit at all. What commands did you run for this to happen? `git rebase upstream/master -i; git push -f` should be enough to fix, if you squash the commits.