From: Jonathan Nieder <jrnieder@gmail.com>
To: Alexandre Oliva <lxoliva@fsfla.org>
Cc: git@vger.kernel.org
Subject: Re: rebase parents, or tracking upstream but removing non-distributable bits
Date: Thu, 30 Dec 2010 14:58:47 -0600 [thread overview]
Message-ID: <20101230205847.GA29012@burratino> (raw)
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"?
next prev parent reply other threads:[~2010-12-30 20:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-30 17:54 rebase parents, or tracking upstream but removing non-distributable bits Alexandre Oliva
2010-12-30 20:58 ` Jonathan Nieder [this message]
2010-12-30 22:32 ` Alexandre Oliva
2010-12-30 23:14 ` Jakub Narebski
2011-01-05 11:44 ` Alexandre Oliva
2010-12-30 22:52 ` Yann Dirson
2010-12-30 22:58 ` Alexandre Erwin Ittner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101230205847.GA29012@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=lxoliva@fsfla.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.