Hi, On Mon, 28 Apr 2008, Linus Torvalds wrote: > On Mon, 28 Apr 2008, Andrew Morton wrote: > > > > origin.patch (generated via git-diff v2.6.25...origin) has: > > > > commit 7f424a8b08c26dc14ac5c17164014539ac9a5c65 > > Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx> > > Date: Fri Apr 25 17:39:01 2008 +0200 > > > > fix idle (arch, acpi and apm) and lockdep > > > > > > and git-x86 (generated via git-diff origin...git-x86) has: > > > > commit 0a1679501624482a06c19af49d55b68d3973e2f0 > > Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx> > > Date: Fri Apr 25 17:39:01 2008 +0200 > > > > fix idle (arch, acpi and apm) and lockdep > > > > > > which I assume is the same patch as a different commit. > > Yes. FWIW that is why I suggested using --cherry-pick. It tries to filter out the patches from "upstream" by calculating a patch-id (Basically a SHA-1 of the patch), and leaving out all commits from "downstream" with the same patch-id. Of course, it does not always work perfectly, because it wants a context of 3 lines to agree. Ciao, Dscho -- 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
