Just do a normal merge, then squash all your commits in into one, using rebase, ...

		Deadron 26 days ago \| parent \| context \| favorite \| on: Git Rebase for the Terrified Just do a normal merge, then squash all your commits in into one, using rebase, then a rebase onto a branch is easy.