git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: rebase parents, or tracking upstream but removing non-distributable bits

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Dec 30, 2010, 20:58 UTC
Message-ID
<20101230205847.GA29012@burratino>
In-Reply-To
<ord3ojb0yy.fsf@livre.localdomain>
Alexandre Oliva wrote:
Show 5 quoted lines
> 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"?
Previous: Alexandre OlivaNext: Alexandre Oliva
Message 2 of 7 in “rebase parents, or tracking upstream but removing non-distributable bits”
  1. Alexandre OlivaDec 30, 2010
  2. Jonathan NiederDec 30, 2010
  3. Alexandre OlivaDec 30, 2010
  4. Jakub NarebskiDec 30, 2010
  5. Alexandre OlivaJan 5, 2011
  6. Yann DirsonDec 30, 2010
  7. Alexandre Erwin IttnerDec 30, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.