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

Re[2]: git loses a commit after reordering.

From
NONikita Orlov <fatemail@mail.ru>
Date
May 1, 2017, 13:04 UTC
Message-ID
<1493643894.701604094@f346.i.mail.ru>
In-Reply-To
<20170429225642.GA25902@alpha.vpn.ikke.info>
Show 8 quoted lines
>On Sun, 30 Apr 2017, 1:56 +03:00 from Kevin Daudt <me@ikke.info>:
>Not sure if this is the case here, but it at least confirms that rebase
>--preserve-merges was not meant to reorder commits.
>
>See [this][1] thread for more background on this limitation.
>
>[0]: https://git-scm.com/docs/git-rebase#_bugs
>[1]: https://public-inbox.org/git/1mtveu4.19lvgi1c0hmhaM%25lists@haller-berlin.de/

This is it. As I understand git-rebase--helper is an attempt to fix the bug. But it's still in development, isn't it?

Is there a simple/the right way how to do reordering without losing merge commits now? E.g., I've done it by git-cherry-pick during interactive rebasing.

Thanks.

-- Nikita Orlov

Previous: Kevin DaudtNext: Junio C Hamano
Message 3 of 5 in “git loses a commit after reordering.”
  1. Nikita OrlovApr 27, 2017
  2. Kevin DaudtApr 29, 2017
  3. Re[2]: git loses a commit after reordering.Nikita Orlov, May 1, 2017
  4. Junio C HamanoMay 1, 2017
  5. Johannes SchindelinMay 2, 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.