From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: "rebase -ri" (was Re: Problems with ra/rebase-i-more-options - should we revert it?)
Date: Wed, 15 Jan 2020 14:53:04 -0800 [thread overview]
Message-ID: <xmqqr200ib73.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <xmqqftggk2oi.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's message of "Wed, 15 Jan 2020 10:14:05 -0800")
Junio C Hamano <gitster@pobox.com> writes:
>> Having said that, if you ever find yourself wanting Just One Feature in
>> `--rebase-merges` that would make it worthwhile for you to think about
>> switching your patch-based workflow to a `rebase -ir`-based one, please
>> let me know, and I will try my best to accommodate.
I missed a mention of 'patch' here when I prepared my earlier reply.
I do not expect "rebase -ri" to play any role in the part of the
workflow that accepts patches from the mailing list.
The involvement of "rebase -ri" (vs Meta/Reintegrate) is purely what
happens after a topic is queued and starts to get tested with other
topics on integration branches, and no "patch based workflow" plays
any role there---it does not make any sense to base that part on
anything but merge (and possibly cherry-picking an evil merge from
an earlier round).
prev parent reply other threads:[~2020-01-15 22:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-12 16:12 Problems with ra/rebase-i-more-options - should we revert it? Phillip Wood
2020-01-12 17:31 ` Phillip Wood
2020-01-12 18:41 ` Johannes Schindelin
2020-01-17 14:11 ` Phillip Wood
2020-01-20 11:15 ` Johannes Schindelin
2020-01-12 21:12 ` Junio C Hamano
2020-01-13 0:43 ` Junio C Hamano
2020-01-13 18:11 ` Junio C Hamano
2020-01-13 22:03 ` "rebase -ri" (was Re: Problems with ra/rebase-i-more-options - should we revert it?) Junio C Hamano
2020-01-15 14:03 ` Johannes Schindelin
2020-01-15 18:14 ` Junio C Hamano
2020-01-15 21:23 ` Rebasing evil merges with --rebase-merges Igor Djordjevic
2020-01-16 7:42 ` Sergey Organov
2020-01-15 22:53 ` Junio C Hamano [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqr200ib73.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).