повторное применение коммитов поверх другого базового наконечника (Reapply commits on top of another base tip)
Ошибки (баги) (Bugs)
The todo list presented by the deprecated --preserve-merges
--interactive
does not represent the topology of the revision
graph (use --rebase-merges
instead). Editing commits and
rewording their commit messages should work fine, but attempts to
reorder commits tend to produce counterintuitive results. Use
--rebase-merges
in such scenarios instead.
For example, an attempt to rearrange
1 --- 2 --- 3 --- 4 --- 5
to
1 --- 2 --- 4 --- 3 --- 5
by moving the "pick 4" line will result in the following history:
3
/
1 --- 2 --- 4 --- 5