Re: Git Vs. Svn for a project which *must* distribute binaries too.
- From
- Olivier Galibert <galibert@pobox.com>
- Date
- Jun 4, 2007, 21:21 UTC
- Message-ID
- <20070604212121.GA31852@dspnet.fr.eu.org>
- In-Reply-To
- <alpine.LFD.0.98.0706041336440.23741@woody.linux-foundation.org>
On Mon, Jun 04, 2007 at 01:45:26PM -0700, Linus Torvalds wrote:
Show 7 quoted lines
> I'd like to point out some more upsides and downsides of "git rebase". > > Downsides: > > - you're rewriting history, so you MUST NOT have made your pre-rebase > changes available publicly anywhere else (or you are in a world of pain > with duplicate history and tons of confusion)
Wouldn't it be possible to register the rebase somewhere (weak parent? some kind of note not influencing the sha1 ?) that pull/merge could follow? Rebases and cherry-picking are a special kind of merge, so maybe it can be handled like one where it counts...
OG.