From: Igor Djordjevic <igor.d.djordjevic@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Sergey Organov <sorganov@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Rebasing evil merges with --rebase-merges
Date: Wed, 15 Jan 2020 22:23:34 +0100 [thread overview]
Message-ID: <9355c545-08a5-ef63-f7bf-65201d50acc8@gmail.com> (raw)
In-Reply-To: <xmqqftggk2oi.fsf@gitster-ct.c.googlers.com>
On 15/01/2020 19:14, Junio C Hamano wrote:
>
> Johannes Schindelin <Johannes.Schindelin@gmx.de> 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.
>
> 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.
FYI (and anyone interested), it`s something we actually brought up
some two years ago, at the time of introducing `--rebase-merges`
(known as `--recreate-merges` back at the time), see[1].
It ended being a lengthy and heated discussion (inside a few
different topics as well, like original RFC[2] and it`s v2 update[3]),
myself being guilty for dropping out eventually and not following it
through, though, life taking me in another direction at the moment...
but I still find this functionality to be very useful, not to say
essential, even, for reliable complex merge _rebasing_ (meaning
keeping "evil merge" changes, too), and not just merge _recreating_
(loosing "evil merge" changes, and worse - doing it silently, as you
experienced yourself now as well).
p.s. Bringing that one up again, it can`t go without saying a huge
thanks to Dscho for taking it this far in the meantime anyway <3
Regards, Buga
[1]: https://lore.kernel.org/git/bc9f82fb-fd18-ee45-36a4-921a1381b32e@gmail.com/
[2]: https://lore.kernel.org/git/87y3jtqdyg.fsf@javad.com/
[3]: https://lore.kernel.org/git/87r2oxe3o1.fsf@javad.com/
next prev parent reply other threads:[~2020-01-15 21:23 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 ` Igor Djordjevic [this message]
2020-01-16 7:42 ` Rebasing evil merges with --rebase-merges 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=9355c545-08a5-ef63-f7bf-65201d50acc8@gmail.com \
--to=igor.d.djordjevic@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sorganov@gmail.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.
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).