Git pull after commit

Question

I have done a commit and then I remembered that there was a change on the branch, so I did a git pull. But this made a merge, so now it looks like this:

Is there a way to solve this? How to move my commit after the origin/dev ? Please be explicit in steps, because I am a beginner.

Answer 1

You should:

git pull -r

Also, read this post about deleting merge commits by rebasing them:

http://marketblog.envato.com/general/rebasing-merge-commits-in-git/