git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Aug 30, 2017, 20:28 UTC
Message-ID
<alpine.DEB.2.21.1.1708302223510.7424@virtualbox>
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

Previous: Phillip WoodNext: Sebastian Schuberth
Message 10 of 12 in “Commit dropped when swapping commits with rebase -i -p”
  1. Sebastian SchuberthAug 30, 2017
  2. Martin ÅgrenAug 30, 2017
  3. Sebastian SchuberthAug 30, 2017
  4. Jonathan NiederSep 2, 2017
  5. Sebastian SchuberthSep 11, 2017
  6. Junio C HamanoSep 15, 2017
  7. Andreas HeidukSep 16, 2017
  8. Sebastian SchuberthSep 16, 2017
  9. Phillip WoodSep 17, 2017
  10. Johannes SchindelinAug 30, 2017
  11. Sebastian SchuberthAug 30, 2017
  12. Johannes SchindelinSep 1, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.