{"thread":{"id":"29842","subject":"Comparing commits on two different branches","startedAt":"2012-03-05T16:18:51Z","lastAt":"2012-03-05T17:38:24Z","messageCount":2,"participants":["Howard Miller","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"186121","messageId":"CAHVO_92V3rRBngrZMLeq17ekKKB41kTmok39uUeZ6aOzxB65dQ@mail.gmail.com","threadId":"29842","inReplyTo":null,"subject":"Comparing commits on two different branches","fromName":"Howard Miller","fromEmail":"howard@e-learndesign.co.uk","sentAt":"2012-03-05T16:18:51Z","receivedAt":"2012-03-05T16:18:51Z","isPatch":false,"sender":{"key":"howard@e-learndesign.co.uk","avatar":"https://gravatar.com/avatar/ddb66c6a4a077e52b823ac5b04f33ab927cb90e2ab1eafedaeba07b1920bb99e?d=mp&s=160"},"body":"Hi,\n\nI have two branches - I know that one differs from the other entirely\nby a (large) number of commits that I have made over some time.\nUnfortunately, these are now all mixed up with a load of other commits\nthat have been merged into both from the upstream project.\n\nIs there any way that I can get the list of commits that represent the\ndifference between the two branches? Even better is there some way\nthat I can apply all those commits to a third branch (a newer version\nof the project) without having to do hundreds of cherry-picks?\n\nThanks!\n"},{"id":"186128","messageId":"7vr4x70wz3.fsf@alter.siamese.dyndns.org","threadId":"29842","inReplyTo":"CAHVO_92V3rRBngrZMLeq17ekKKB41kTmok39uUeZ6aOzxB65dQ@mail.gmail.com","subject":"Re: Comparing commits on two different branches","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-03-05T17:38:24Z","receivedAt":"2012-03-05T17:38:24Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Howard Miller <howard@e-learndesign.co.uk> writes:\n\n> I have two branches - I know that one differs from the other entirely\n> by a (large) number of commits that I have made over some time.\n> Unfortunately, these are now all mixed up with a load of other commits\n> that have been merged into both from the upstream project.\n\n\"now all mixed up\" makes me feel a lot less optimistic, but have you\ntried git-cherry?\n"}]}