Merge two git commits into one

This is an example to merge 2 last commits.

1. git rebase -i HEAD~2

2. Change pick to squash the commit you want to merge

3. Save and Exit

4. git push -f origin master