Instead of ignoring merges, try to recreate them.
+This uses the `--interactive` machinery internally, but combining it
+with the `--interactive` option explicitly is generally not a good
+idea unless you know what you are doing (see BUGS below).
Rebase all commits reachable from <branch>, instead of
+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.
+For example, an attempt to rearrange
+1 --- 2 --- 3 --- 4 --- 5
+1 --- 2 --- 4 --- 3 --- 5
+by moving the "pick 4" line will result in the following history:
Written by Junio C Hamano <email@example.com> and