From: Johannes Sixt <j6t@kdbg.org>
Date: Fri, 25 May 2012 20:03:21 GMT
Subject: Re: [PATCH/RFC] rebase -p: do not redo the merge, but cherry-pick first-parent changes
Message-ID: <4FBFE589.1080805@kdbg.org>
In-Reply-To: <7vy5ogtcxm.fsf@alter.siamese.dyndns.org>

Am 25.05.2012 18:58, schrieb Junio C Hamano:
> Johannes Sixt <j6t@kdbg.org> writes:
> 
>> First-parentship. When a topic or an integration branch is rebased (with
>> --preserve-merges), only the first-parent chain should be rewritten.
> 
> While I think the "start from commit T and down to where it branches off
> of 'master', rebuild first-parent chain on top of elsewhere" mode has
> uses, there is no way it can co-exist under the same option name with the
> current "transplant the DAG as a whole on top of elsewhere, preserving the
> topology inside the DAG" mode.

Fair enough.

>  The name "preserve merges" clicks with the
> latter mode better than the former mode, at least to me.  Perhaps the
> other mode can be called "rebase --first-parent" or something?

Sounds good. I'll take this route.

-- Hannes