Search code examples
gitgithubmergegit-diff

Difference between two merges of same GIT branch

Let's say I have a remote repo XYZ and the branches TEST and TEST1.

I pulled the remote XYZ to my local XYZ repo and switched to branch TEST1.

I made couple of commits and pushed to the remote. Then I merged from TEST1 to TEST (merge A).

I made few more commits to TEST1 and pushed them to the remote. Then I merged all these commits to TEST (merge B).

Question:

How do I find the differences and list out all the files that were changed or added between these two merges (merge A and merge B), in the branch TEST?

Solution 
  • git diff --name-only ${MERGE_SHA_A}..${MERGE_SHA_B}

    should show the diff files, without the --name-only you will see the actual diff if this is what you mean

    git log

    should list commits if you need the ids