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

If you would like to try a case where you have a real merge, you could run the following commands after git checkout master:

touch c
git add c
git commit -m "3"
git merge topic

That is, you add a commit to the master branch. Then the graph of commits is no longer a linear sequence, and data has to be merged from multiple branches.