On Mon, Jun 04, 2007 at 01:45:26PM -0700, Linus Torvalds wrote:
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.