Re: git loses a commit after reordering.
- From
Kevin Daudt <me@ikke.info>
- Date
- Apr 29, 2017, 22:56 UTC
- Message-ID
- <20170429225642.GA25902@alpha.vpn.ikke.info>
- In-Reply-To
- <1493278996.239768474@f402.i.mail.ru>
On Thu, Apr 27, 2017 at 10:43:16AM +0300, Nikita Orlov wrote:
Show 15 quoted lines
> Hello, my name is Nikita (male). > > Could you explain this (subject) is a bug or a feature? > > [snip] > > "Some independent changes 1" is missed and its changes are missed as well. > > I tried to move another commit to a farther distance below but there was still only one missed commit. > > Could you explain it? > > Thank you in advance and sorry for my English. > > Best, Nikita
[man git-rebase][0] mentions this under the bug section:
> The todo list presented by --preserve-merges --interactive does not > represent the topology of the revision graph. Editing commits and > rewording their commit messages should work fine, but attempts to > reorder commits tend to produce counterintuitive results.
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/