threads / discuss / 29842

Comparing commits on two different branches

Subject: Comparing commits on two different branches

## tl;dr

2 messages between Mar 5, 2012 and Mar 5, 2012.

replies: 1people: 2as markdown or json

Howard Miller· Mar 5, 2012, 16:18 UTC · lore

Hi,

I have two branches - I know that one differs from the other entirely by a (large) number of commits that I have made over some time. Unfortunately, these are now all mixed up with a load of other commits that have been merged into both from the upstream project.

Is there any way that I can get the list of commits that represent the difference between the two branches? Even better is there some way that I can apply all those commits to a third branch (a newer version of the project) without having to do hundreds of cherry-picks?

Thanks!

Junio C Hamano· Mar 5, 2012, 17:38 UTC · re: Howard Miller · lore

Re: Comparing commits on two different branches

Howard Miller <howard@e-learndesign.co.uk> writes:

> I have two branches - I know that one differs from the other entirely
> by a (large) number of commits that I have made over some time.
> Unfortunately, these are now all mixed up with a load of other commits
> that have been merged into both from the upstream project.

"now all mixed up" makes me feel a lot less optimistic, but have you tried git-cherry?