Git: is there a quick way to see when the last git merge wizard was executed in the current working branch?

Question

I usually work on a branch that diverges from the master. So while I develop things, I do git merge master from time to time. And sometimes I want to know when was the last time, I did git merge master on this branch. I know I can do git log and look for "Merge branch" and see the commit date ... but if there is magic, I would like to know!

Answer 1

 git show :/"Merge branch 'master'" 

Answer 2

I personally like to check the difference in the revision trees:

 git log --graph --left-right --cherry-pick --oneline branch1...branch2 

In addition, in the "magic" department there is

 git show-branch git show-branch branch1 branch2 git show-branch --all # which does all of the above and more 

And finally

 git merge-base branch1 branch2 

to name the base version to be combined with

---

Notes:

• replace branch1 and branch2 as per your project
• you can use these commands if you want: http://progit.org/book/ch2-7.html#git_aliases
• --cherry-pick options have a rare form of magic :

 --cherry-pick 

Omit any commit that introduces the same change as another commit on the “other side” when the set of commits is limited to a symmetric difference.

For example, if you have two branches, A and B, the usual way to list all commits is only on one side - with -left-right, as in the example above in the description of this parameter. However, it shows the fixations that were selected from another branch (for example, “3rd on b” can be selected from cherry from branch A). With this option, such commit pairs are excluded from the output.

Answer 3

You can use git merge-base to get a common ancestor and display the results.

Something like that:

git merge-base HEAD master | git show --pretty