https://git-scm.com/docs/git-merge
C-f squash
You can compress a series of commits into one with squash in git.