From: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu, 30 Dec 2010 20:58:47 GMT
Subject: Re: rebase parents, or tracking upstream but removing non-distributable bits
Message-ID: <20101230205847.GA29012@burratino>
In-Reply-To: <ord3ojb0yy.fsf@livre.localdomain>

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"?