git diff between branches but ignoring the effect of certain commits

Question

We have 2 branches

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)

I'm re-reading your question, and the last sentence doesn't make sense to me: "What command should I use so that I can check that all merges have been done (except for the modifications on these 10 files)" Have you already merged back in and you're trying to see what *did* change? — vergenzt, Jun 25 '12 at 19:06
Yes - this might be confusing. The 10 files will always be different from what we have on master. I just want to be sure that modifications on all other files are tracked, as if the two branches are in sync. — Francis Martens, Jun 26 '12 at 04:16

score 4 · Accepted Answer · answered Jun 25 '12 at 19:02

4

$ git diff branchX...master

Notice that it is three dots, which gets the difference between the common ancester of branchX and master, and master itself.

answered Jun 25 '12 at 19:02

vergenzt

score 0 · Answer 2 · edited May 23 '17 at 12:03

0

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

edited May 23 '17 at 12:03

Community

answered Aug 25 '12 at 14:18

dvdvck

2 Answers2