Squash commits

squashgit

// Squash the number of commits you want, 6 in this example
git reset --mixed HEAD~6 
// Stage all the files
git add -A
// Commit the staged files
git commit -m "Your message"
// Then update the remote using --force
git push --force origin <YOUR-BRANCH-NAME>

// Or use rebase

git rebase -i HEAD~6
// then select the commits you want to squash by setting `s` instead of `pick`, after that save, 
// and you will need to edit the commit message, and then you push force
git push --force origin <YOUR-BRANCH-NAME>