Re: [PATCH/RFC] rebase -p: do not redo the merge, but cherry-pick first-parent changes

Johannes Sixt [off-list ref] 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.  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?

Am 25.05.2012 18:58, schrieb Junio C Hamano:

Johannes Sixt [off-list ref] writes:

quoted

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