SHELL

git merge squash

git checkout master			# Switches to your master branch.
git merge --squash bugfix	# All grouped commits from bugfix to current branch
git commit					# Creates a single commit from the merged changes