Hi, On Mon, 27 Nov 2006, Junio C Hamano wrote: > Johannes Schindelin <Johannes.Schindelin@xxxxxx> 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html