How do I check git log for a “fast-forward” merge?

Question

In the following example, is there a way to know a merge happened? Looking at git log, I can\'t tell I merged.

# setup example directory
$ mkdir test
$ cd test
         


        

Answer 1

You can use git merge-base:

git merge-base master topic

It will show the cccc64de3947828f487a8ce3c3e72b0f68dc88c3 ( 2) commit

Or you can use:

git show $(git merge-base master topic)