Interactive rebase
Using interactive rebase in IntelliJ IDEA
Use interactive rebase to clean up your commit history before pushing your changes. You can reorder commits, skip them, or squash them. Use Squash to combine multiple commits and their commit messages, or Fixup to combine the commits under one commit message.