Thread (8 messages) 8 messages, 4 authors, 2017-09-11

Re: Commit dropped when swapping commits with rebase -i -p

From: Johannes Schindelin <hidden>
Date: 2017-09-01 19:16:40

Hi Sebastian,

On Wed, 30 Aug 2017, Sebastian Schuberth wrote:
On Wed, Aug 30, 2017 at 10:28 PM, Johannes Schindelin
[off-list ref] wrote:
quoted
Please see 'exchange two commits with -p' in t3404. This is a known
Thank for pointing out the test.
quoted
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.
In any case, I wouldn't have expected *that* kind of side effect for
such a simple case (that does not involve any merge commits).

If these options are fundamentally incompatible as you say, would you
agree that it makes sense to disallow their usage together (instead of
just documenting that you should know what you're doing)?
As I said already, I agreed with you before you said it, but I was
overruled.

Ciao,
Johannes
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help