From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 27 Nov 2006 23:40:16 GMT
Subject: Re: Idea for rebase strategy
Message-ID: <Pine.LNX.4.63.0611280037200.30004@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7vfyc5l24t.fsf@assigned-by-dhcp.cox.net>

Hi,

On Mon, 27 Nov 2006, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > an idea hit me today: maybe we can make rebase work nicely with merges 
> > after all. We could record the original branch point and the new branch 
> > point for rebases.
> 
> [...]
> 
> If we have a reliable ref-log for 'topic' that should be trivial
> to do.

But of course! Yet another reason to introduce core.disableRefLog, and 
turn it on by default...

The graceful merging of a rebased branch indeed depends on the local 
history, i.e. what is stored in the reflog.

Ciao,
Dscho