Git: Merge in only one commit

It sounds like you’re looking for the --squash option of git-merge:

git checkout master
git merge --squash branch -m "super commit"