merge, squash, all commits of the feature-branch into the current branch. git merge --squash feature-branch git commit