Since asking my last question which turned out to be about rebasing with GIT, I have decided that I don\'t want to rebase at all. Instead I want to:
You can also use git merge with the --squash option.
--squash