On Jun 20 2016, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Nikolaus Rath <Nikolaus@xxxxxxxx> writes:
>
>> What's the best way to find all commits in a branch A that have not been
>> cherry-picked from (or to) another branch B?
>>
>> I think I could format-patch all commits in every branch into separate
>> files, hash the Author and Date of each files, and then compare the two
>> lists. But I'm hoping there's a way to instead have git do the
>> heavy-lifting?
>
> "git cherry" perhaps?
That seems to work only the "wrong way around". I have a tag
fuse_3_0_start, which is the common ancestor to "master" and
"fuse_2_9_bugfix". I'd like to find all the commits from fuse_3_0_start
to master that have not been cherry-picked into fuse_2_9_bugfix.
However:
* "git cherry fuse_3_0_start master release2.9" tells me nothing has
been cherry-picked at all (only lines with +)
* "git cherry fuse_3_0_start release2.9 master" also tells me nothing
has been cherry picked, but somehow shows a smaller total number of
commits.
* "git cherry master release2.9 fuse_3_0_start" gives me the commits
from fuse_2_9_bugfix that have not been cherry-picked into master
(which seems to be in contradiction to the two earlier commands).
Am I missing something obvious?
Best,
-Nikolaus
--
GPG encrypted emails preferred. Key id: 0xD113FCAC3C4E599F
Fingerprint: ED31 791B 2C5C 1613 AF38 8B8A D113 FCAC 3C4E 599F
»Time flies like an arrow, fruit flies like a Banana.«
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html