How to show files that were merged without fast forward in Git?

Question

I have two branches, and I merge branch1 into branch2 without fast forward.

After the merge, I run the 'git show' command, I get a commit message (which is a merge from a file without fast-forward) and no list files that have been changed.

How to get list files modified in merge?

SOLVED:

When in div2 after merging I used the following:

git diff HEAD~

This returned the correct result.

Answer 1

When in div2 after merging I used the following:

git diff HEAD~

This returned the correct result.

Answer 2

Did you try to execute the command git whatchanged? (not verified):

git whatchanged --oneline

or

git whatchanged --oneline ..HEAD^
git whatchanged --oneline ..HEAD^2

--oneline

This is an abbreviation --pretty=oneline --abbrev-commitused together.

, 1, 2.

branch2 HEAD^2, HEAD.

" ":

git diff --name-status ..HEAD^2

.

Answer 3

git reflog, , . , branch2 . , , HEAD@{1}, , , , :

git diff --stat HEAD@{1}