rebase.instructionFormat. A customized instruction format will automatically
have the long commit hash prepended to the format.
---recreate-merges[=(rebase-cousins|no-rebase-cousins)]::
- Recreate merge commits instead of flattening the history by replaying
- merges. Merge conflict resolutions or manual amendments to merge
- commits are not recreated automatically, but have to be recreated
- manually.
-+
-By default, or when `no-rebase-cousins` was specified, commits which do not
-have `<upstream>` as direct ancestor keep their original branch point.
-If the `rebase-cousins` mode is turned on, such commits are rebased onto
-`<upstream>` (or `<onto>`, if specified).
-
-p::
--preserve-merges::
Recreate merge commits instead of flattening the history by replaying
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. Use
---recreate-merges for a more faithful representation.
+reorder commits tend to produce counterintuitive results.
For example, an attempt to rearrange
------------