git diff without intermediate commits

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello List,

I have a question regarding git diff command.

My Problem:
When we work in git projects under github, we will normally
create a local branch, make some changes commit it
create a PR & send that for review
may have to merge 'master' branch one or more times to make sure that automated build works properly after merging the latest master branch.
Will enhance the PR based on review comments OR add new changes.

Assuming that my commit history is as follows:

a. commit1     <-- My local commit 1
b. merge_commit1 <- Merge commit from 'master'
c. merge_commit2
....
f. merge_commit_n
g. commit2  <-- My local commit 2



Now, if I issue 'git diff commit1 commit2', git will show a diff of commit1, commit2 plus the intermediate merge commits. What git does here is absolutely correct. But, my requirement is to only have the difference between commit1 & commit2 (without the intermediate merge commits).

We can definitely compare individual files between two commits in the following manner
e.g., git diff commit1:file commit2:file
but, if I want to get the diff for all my files from commit1 to commit2 without considering totally unrelated files from the merge commits in between commit1 and commit2, I think it is a tedious process. Correct me if I am wrong. 

So, my questions are.

Is there a feature readily available in git that will compare just commit1 & commit2 without considering the intermediate merge commits?

 If the answer to the above question to is 'no', if I am providing a patch for the same for 'git diff' & 'git difftool' probably with a new command line option, would you accept it?



Thank You!
Sudheer



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux