Re: Compare two diffs on the command line?

2015-09-04 Thread Phil Susi

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

On Fri, Sep 4, 2015 at 11:00 AM, Phil Susi  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.


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: Compare two diffs on the command line?

2015-09-04 Thread Junio C Hamano
On Fri, Sep 4, 2015 at 11:00 AM, Phil Susi  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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html