From: Kevin Daudt <me@ikke.info>
To: Anatoly Borodin <anatoly.borodin@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Limitiations of git rebase --preserve-merges --interactive
Date: Thu, 22 Sep 2016 21:48:48 +0200 [thread overview]
Message-ID: <20160922194848.GB6641@ikke.info> (raw)
In-Reply-To: <ns1bln$2ej$1@blaine.gmane.org>
On Thu, Sep 22, 2016 at 07:33:11PM +0000, Anatoly Borodin wrote:
> Hi Stefan,
>
> this section was added to the manual in the commit
> cddb42d2c58a9de9b2b5ef68817778e7afaace3e by "Jonathan Nieder"
> <jrnieder@gmail.com> 6 years ago. Maybe he remembers better?
>
Just to make it clear, this section explicitly talks about 'bugs' with
preserve-merges and interactive rebase. Without the --preserve-merges
option, those operations works as expected.
The reason, as that section explains, is that it's not possible to store
the merge structure in the flat todo list. I assume this means git
internally remembers where the merge commit was, and then restores it
while rebasing.
Changing the order, or dropping commits might then give unexpected
results.
next prev parent reply other threads:[~2016-09-22 19:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-20 8:46 Limitiations of git rebase --preserve-merges --interactive Stefan Haller
2016-09-22 19:33 ` Anatoly Borodin
2016-09-22 19:48 ` Kevin Daudt [this message]
2016-09-22 20:54 ` Stefan Beller
2016-09-23 10:40 ` Stefan Haller
2016-09-23 21:13 ` Johannes Schindelin
2016-09-23 22:26 ` Stefan Beller
2016-09-22 21:04 ` Anatoly Borodin
2016-09-22 21:01 ` Anatoly Borodin
2016-09-22 21:08 ` Stefan Beller
2016-09-23 21:04 ` Johannes Schindelin
2016-09-23 10:40 ` Stefan Haller
2016-09-23 15:37 ` Junio C Hamano
2016-09-23 15:50 ` Stefan Haller
2016-09-23 19:24 ` 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
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=20160922194848.GB6641@ikke.info \
--to=me@ikke.info \
--cc=anatoly.borodin@gmail.com \
--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).