Merge some branch, commits it all at master as a single commit

gistfile1.txt

# Updates if needed
git checkout master
git fetch
git pull

# Merge and reset
git merge whatever_branch
git reset origin/master

# Commits everything as a single commit
git add .
git commit -m 'your single commit description here'