$ git rebase -i HEAD~4
At the interactive screen that opens up, replace pick with squash at the top for all the commits that you want to squash.
Save and close the editor through esc --> :wq
$ git push origin branch-name --force
# Say your bug fix branch is called bugfix and you want to merge it into master
git checkout master
git merge --squash bugfix
git commit
# This will take all the commits from the bugfix branch,
# squash them into 1 commit,
# and merge it with your master branch.git reset --soft HEAD~3 &&
git commitgit rebase -i HEAD~5
# As the commit on line 1 is HEAD, in most cases you would leave this as
# pick. You cannot use squash or fixup as there is no other commit to
# squash the commit into.git rebase -i HEAD~20
Another way to squash all your commits is to reset the index to master:
git checkout yourBranch
git reset $(git merge-base master $(git branch --show-current))
git add -A
git commit -m "one commit on yourBranch"