Alexandre Oliva wrote: > Now, it looks like I might be able to pull from upstream if I maintain > manually a graft file that named each upstream commit as an additional > parent of the corresponding local rebase commit that brought it into my > rewritten tree. Workable, maybe, but this wouldn't help third parties > that used my public repository. Have you looked into "git replace"? -- 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