* Comparing commits on two different branches
@ 2012-03-05 16:18 Howard Miller
2012-03-05 17:38 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Howard Miller @ 2012-03-05 16:18 UTC (permalink / raw)
To: git
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!
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Comparing commits on two different branches
2012-03-05 16:18 Comparing commits on two different branches Howard Miller
@ 2012-03-05 17:38 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2012-03-05 17:38 UTC (permalink / raw)
To: Howard Miller; +Cc: git
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?
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-03-05 17:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-05 16:18 Comparing commits on two different branches Howard Miller
2012-03-05 17:38 ` Junio C Hamano
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 NNTP newsgroup(s).