How to merge a branch as a single commit in Git

Squashing commits is for suckers :p, heres a quick and dirty alternative.

1
2
3
4
git checkout master
git pull
git merge topic/feature
git reset origin/master

At this stage you are left on master with all the changes from topic/feature unstaged

1
2
git add --all
git commit