From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Sebastian Schuberth <sschuberth@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Commit dropped when swapping commits with rebase -i -p
Date: Wed, 30 Aug 2017 22:28:19 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.21.1.1708302223510.7424@virtualbox> (raw)
In-Reply-To: <oo62vr$pvq$1@blaine.gmane.org>
Hi Sebastian,
On Wed, 30 Aug 2017, Sebastian Schuberth wrote:
> I believe stumbled upon a nasty bug in Git: It looks like a commits gets
> dropped during interactive rebase when asking to preserve merges.
Please see 'exchange two commits with -p' in t3404. This is a known
breakage, and due to the fact that -p and -i are fundamentally
incompatible with one another (even if -p's implementation was based on
-i's). I never had in mind for -p to be allowed together with -i, and was
against allowing it because of the design.
Short version: do not use -p with -i.
Ciao,
Johannes
next prev parent reply other threads:[~2017-08-30 20:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-30 10:11 Commit dropped when swapping commits with rebase -i -p Sebastian Schuberth
2017-08-30 18:07 ` Martin Ågren
2017-08-30 18:59 ` Sebastian Schuberth
2017-09-02 0:04 ` Jonathan Nieder
2017-09-11 8:45 ` Sebastian Schuberth
2017-09-15 20:52 ` Junio C Hamano
2017-09-16 10:41 ` Andreas Heiduk
2017-09-16 13:45 ` Sebastian Schuberth
2017-09-17 13:31 ` Phillip Wood
2017-08-30 20:28 ` Johannes Schindelin [this message]
2017-08-30 20:48 ` Sebastian Schuberth
2017-09-01 19:16 ` Johannes Schindelin
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=alpine.DEB.2.21.1.1708302223510.7424@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=sschuberth@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).