Welcome to Shaun Luttin's public notebook. It contains rough, practical notes. The guiding idea is that, despite what marketing tells us, there are no experts at anything. Sharing our half-baked ideas helps everyone. We're all just muddling thru. Find out more about our work at bigfont.ca.

Review a merge commit - how did the destination branch change?

Tags: git, git-merge

After merging feature into master, answer the following questions.

What files did feature modify? Look at the difference between master and the first parent of master (which in this case is the previous master). Those differences will show what files the merge in of feature changed.

git checkout master
git diff --name-only head^1..head --diff-filter=M

What files did feature delete?

git checkout master
git diff --name-only head^1..head --diff-filter=D