Git: Add commits from same branch to master

Question

I have the situation shown in the picture:

How do I move the master head to point to the top commit (Added preferences) because currently I cannot push to the remote repository as it says everything up to date (expected, since master is not pointing to the most recent commit)

Answer 1

What about:

$ git checkout master
$ git merge --ff-only <hash of topmost commit>

Answer 2

While on the "Added preferences" commit, try git merge master. Depending on whether you want fast-worward or not - you may add --ff flag.