Thread (3 messages) 3 messages, 2 authors, 2017-05-01

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

From: Nikita Orlov <hidden>
Date: 2017-05-01 14:55:30

On Sun, 30 Apr 2017, 1:56 +03:00 from Kevin Daudt [off-list ref]:
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help