From: Nikita Orlov Date: Mon, 01 May 2017 13:04:54 GMT Subject: Re[2]: git loses a commit after reordering. Message-ID: <1493643894.701604094@f346.i.mail.ru> In-Reply-To: <20170429225642.GA25902@alpha.vpn.ikke.info> >On Sun, 30 Apr 2017, 1:56 +03:00 from Kevin Daudt : >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