Comment by a_t48

From memory...

    git merge origin/master
    git reset origin/master
    git commit -am "squash" # might need some extra fixup if your branch has added files

No need to make a temp branch. I know there's probably a more efficient way of doing this, but this is what's stuck in my head.