[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: Commit dropped when swapping commits with rebase -i -p
From:       Sebastian Schuberth <sschuberth () gmail ! com>
Date:       2017-08-30 20:48:31
Message-ID: CAHGBnuO0dviVr0zD+KqANc6Ju8-cZh2KLbLz6NH3h+jprRzbaw () mail ! gmail ! com
[Download RAW message or body]

On Wed, Aug 30, 2017 at 10:28 PM, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:

> Please see 'exchange two commits with -p' in t3404. This is a known

Thank for pointing out the test.

> 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)?

-- 
Sebastian Schuberth
[prev in list] [next in list] [prev in thread] [next in thread]