Squashing Commits into One Commit

SourceTree
1. Select the commit under the first commit of your bug fix. It helps using Current Branch Filter without showing remotes

2. Right click on selected commit and click rebase children interactively

3. Select top commit and select squash with previous. Make sure to click ok becasue multiple squash do not work well.
 4. Repeat until you have squashed all the commits into one.
5. Force push to the remote branch

Git Extensions
Make sure you have a clean working space - no pending, uncommitted changes.

1. Right click on the first commit, choose Reset current branch to here.
It's important to choose Mixed option (it's default), otherwise you will loose your later commits:
2. Open the Commit dialog, stage the changes and then amend commit (update the commit message if necessary):
And you are done!