On Mon, 28 Apr 2008 15:14:20 -0700 (PDT) Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > > > On Mon, 28 Apr 2008, Linus Torvalds wrote: > > > > I don't actually see what was wrong with the old script. The merge was > > really oddly done, but apart from that, something like this should work > > (just your old script with some trivial fixes to 'git merge' and using > > somewhat saner arguments): > > Side note: you are still going to have *exactly* the same issue if you > have other git trees (not origin) that contain the same patch. > yup. The same-patch-in-two-trees problem is surprisingly rare. -- 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
