git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Sudheer D <Sudheer.D@ibm.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: git diff without intermediate commits
Date: Thu, 9 Mar 2023 05:52:15 +0000	[thread overview]
Message-ID: <MN2PR15MB3454AE2CE41E79F2B260DDD3E1B59@MN2PR15MB3454.namprd15.prod.outlook.com> (raw)

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

             reply	other threads:[~2023-03-09  5:52 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-09  5:52 Sudheer D [this message]
2023-03-09  6:22 ` git diff without intermediate commits Jeff King
2023-03-09 17:13   ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=MN2PR15MB3454AE2CE41E79F2B260DDD3E1B59@MN2PR15MB3454.namprd15.prod.outlook.com \
    --to=sudheer.d@ibm.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).