threads / discuss / 40275

Compare two diffs on the command line?

Subject: Compare two diffs on the command line?

## tl;dr

3 messages between Sep 4, 2015 and Sep 4, 2015.

replies: 2people: 2as markdown or json

Phil Susi· Sep 4, 2015, 18:00 UTC · lore

If you have a commit that exists on two branches, in gitk you can mark one, then select the other and choose to compare the two. This results in a diff of the two diffs, rather than a diff between the two trees, which include many other changes that have nothing to do with either commit.

Is there a way to do this on the command line? I thought it would be git diff -c or --cc, but it doesn't seem to filter out all of the other differences between the branches.

Junio C Hamano· Sep 4, 2015, 18:10 UTC · re: Phil Susi · lore

Re: Compare two diffs on the command line?

On Fri, Sep 4, 2015 at 11:00 AM, Phil Susi <psusi@ubuntu.com> wrote:

> If you have a commit that exists on two branches, in gitk you can mark one,
> then select the other and choose to compare the two.  This results in a diff
> of the two diffs, rather than a diff between the two trees, which include
> many other changes that have nothing to do with either commit.

I think you are looking for the interdiff(1) tool.

Phil Susi· Sep 4, 2015, 19:23 UTC · re: Junio C Hamano · lore

Re: Compare two diffs on the command line?

On 9/4/2015 2:10 PM, Junio C Hamano wrote:

Show 7 quoted lines

> On Fri, Sep 4, 2015 at 11:00 AM, Phil Susi <psusi@ubuntu.com> wrote:
>> If you have a commit that exists on two branches, in gitk you can mark one,
>> then select the other and choose to compare the two.  This results in a diff
>> of the two diffs, rather than a diff between the two trees, which include
>> many other changes that have nothing to do with either commit.
>
> I think you are looking for the interdiff(1) tool.

Yes, that is how I would do it before git... I was thinking there would be a git way of doing it, especially since it is there in gitk.