git diff between branches but ignoring the effect of certain commits

Question

We have 2 branches

• master
• branchX

BranchX was created to solve some compatibility problem, where a about 10 files had to be changed.

Development on master continues and at a certain stage, I want to check what will change when we merge master into branchX.

What command should I use so that I can check that all merges have been done (except for the modifications on these 10 files)

Answer 1

$ git diff branchX...master

请注意，它是三个点，它获得了branchX和master的公共ancester与master本身之间的区别。

Answer 2

You could do by rewind to the first commit and cherry-picking all those commit that you are interested. Please, check the code on this answer