git reset <parent> —soft; git commit -m squash The first command sets your current comment to parent, with any changes staged, the second commits it. I don’t

git reset <parent> —soft; git commit -m squash The first command sets your current comment to parent, with any changes staged, the second commits it. I don’t mess with the interactive rebase. There’s a magic combination of this and the reflog that can preserve commit history, too.