From: Johannes Sixt <j6t@kdbg.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Stephen Haberman <stephen@exigencecorp.com>,
Andrew Wong <andrew.kw.w@gmail.com>
Subject: Re: [PATCH/RFC] rebase -p: do not redo the merge, but cherry-pick first-parent changes
Date: Fri, 25 May 2012 22:03:21 +0200 [thread overview]
Message-ID: <4FBFE589.1080805@kdbg.org> (raw)
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
next prev parent reply other threads:[~2012-05-25 20:03 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-21 20:19 [PATCH/RFC] rebase -p: do not redo the merge, but cherry-pick first-parent changes Johannes Sixt
2012-05-22 18:23 ` Junio C Hamano
2012-05-22 19:30 ` Johannes Sixt
2012-05-22 23:38 ` Jonathan Nieder
2012-05-23 15:37 ` Martin von Zweigbergk
2012-05-23 18:53 ` Junio C Hamano
2012-05-23 20:41 ` Martin von Zweigbergk
2012-05-24 17:31 ` Junio C Hamano
2012-05-24 17:47 ` Martin von Zweigbergk
2012-05-24 20:09 ` Junio C Hamano
2012-05-24 20:32 ` Johannes Sixt
2012-05-24 21:34 ` Junio C Hamano
2012-05-25 15:58 ` Johannes Sixt
2012-05-25 16:58 ` Junio C Hamano
2012-05-25 20:03 ` Johannes Sixt [this message]
2012-05-23 18:59 ` Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FBFE589.1080805@kdbg.org \
--to=j6t@kdbg.org \
--cc=andrew.kw.w@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.von.zweigbergk@gmail.com \
--cc=stephen@exigencecorp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).