Finding changes in one branch not in two other branch

Aneesh Kumar· Apr 15, 2008, 11:21 UTC · lore

Hi,

I am not sure whether it is available. What i am looking for is

git diff <commit1> <commit2> <commit3>

And it should show changes only in in tree represented by <commit1> but not in both <commit2> and <commit3>

To show a workflow:

kernel releases 2.6.20 and the project release patchset on top of 2.6.20 kernel release 2.6.21 and project release patchset on top of 2.6.21

The second release involve some bug fixes for the project.

The intention is to find out what changed in project with the release of 2.6.21 patchset . The easiest is look at diff of diff. But if git can do it for me why not ??

-aneesh

Junio C Hamano· Apr 15, 2008, 19:05 UTC · re: Aneesh Kumar · lore

Re: Finding changes in one branch not in two other branch

"Aneesh Kumar" <aneesh.kumar@gmail.com> writes:

Show 9 quoted lines

> To show a workflow:
>
> kernel releases 2.6.20 and the project release patchset on top of 2.6.20
> kernel release 2.6.21 and project release patchset on top of 2.6.21
>
> The second release involve some bug fixes for the project.
>
> The intention is to find out what changed in project with the release of
> 2.6.21 patchset

That depends on your definition of what a patchset is.

If it is a set of files, each file has a patch to one or more files to implement a logically independent and complete change (i.e. corresponds to what a commit should be), then you can run git-patch-id on each of them to find the duplicates in these two sets (you do not need a git repository to do this, as patch-id is a freestanding operation).

If you mean a single file that contains the difference between the vanilla
2.6.21 and their version, then you cannot do much better than running
interdiff, I'd guess.