Try git merge origin/master. If you want to be sure that it only does a fast-forward, you can say git merge --ff-only origin/master.
Try git merge origin/master. If you want to be sure that it only does a fast-forward, you can say git merge --ff-only origin/master.