Jonathan Nieder wrote: > +'git cherry' does not cope well with merges from upstream on the > +working branch. Any commits after the original fork point and > +before the latest merge from upstream will be reported as not found > +in <upstream>. > + > + ____*____*____*_____*__> <upstream> > + / \ > + original fork point \ > + \__+__+__+__+__+__+__+__*_> <head> > + > +While these commits are part of upstream..head, their upstream > +counterparts are not in head..upstream. As Junio mentioned, the text and diagram are hard to reconcile since “these commits” are not clearly explained to be “the commits after the original fork point and before the latest merge, marked with a +”. Actually, the whole text is kind of awkward, which is why I left this hanging for so long[1]. Sorry. Adding “(marked +)” after “these commits” sounds reasonable to me as a quick fix. [1] http://bugs.debian.org/575577 -- 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