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 10:14:05 -0800 [thread overview]
Message-ID: <xmqqftggk2oi.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.2001151458100.46@tvgsbejvaqbjf.bet> (Johannes Schindelin's message of "Wed, 15 Jan 2020 15:03:01 +0100 (CET)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>> ... after about 1700+ steps (which did not take more than 20
>> minutes, including the time spent for the manual rebasing of
>> en/rebase-backend topic) I got the same tree for 'pu' I pushed out
>> last night.
>
> Nice!
Nice indeed---I forgot to say more-or-less there, though ;-)
It is quite an achievement to make it practical to rebuild the
maint..pu chain, which would involve 1000+ commits, while allowing
to edit only a fraction of them.
[ellided] observation that tips of the branches that were
rewritten in order to rebase the named tip that contains
them were left stale
> This has been discussed on the list before this past September, but I
> think the discussion has stalled after v2 was sent,...
That's OK. One step at a time ;-)
> 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.
Another thing I noticed was that we may want to attempt to recreate
an evil merge and then stop to ask confirmation. The "rebase -ri" I
did to sanity-check my revert for example failed to bring in the
change made in the existing evil merge when trying to recreate the
merge of the dl/merge-autostash topic into master..pu chain and
silently created a fails-to-build-from-the-source tree instead.
next prev parent reply other threads:[~2020-01-15 18:14 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 [this message]
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 ` "rebase -ri" (was Re: Problems with ra/rebase-i-more-options - should we revert it?) Junio C Hamano
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=xmqqftggk2oi.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).