Git's commits into one commit

I figured it out how to combine several git's commits into one commit for single submission to perforce repo.

For example, I am working on a branch 'working' which is 2 commits ahead of the branch 'master' which the 'master' is synced to the perforce repo. In order to merge all of them(squash), I'll issue following commands:

$ git checkout working

$ git rebase -i HEAD~2

I'll change the 'second commit' to 'squash' so it will be merged down to the first commit.

So when this message is save, The git will prompt another message to edit which will contain the merged commit description. It will display all commit messages from the two commits.

After this is save, The git will merge those two commits into one.

So the merged commit can now be pushed to perforce repo:

$ git checkout master

$ git rebase working

$ git p4 submit

$ git branch -D working

It is done.