Search code examples
gitfast-forward

How do I show the files that where merged with a no fast-forward in Git?


I have two branches, and I am merging branch1 into branch2 with a no fast-forward.

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

How do I get the list files changed in the merge?

SOLVED:

When at branch2 after the merge, I used the following:

git diff HEAD~

That returned the correct result.


Solution

  • When at branch2 after the merge, I used the following:

    git diff HEAD~
    

    That returned the correct result.