On Thu, Mar 7, 2019 at 6:11 AM Johannes Schindelin via GitGitGadget <gitgitgadget@xxxxxxxxx> wrote: > We have something much better now: --rebase-merges (which is a > complete re-design --preserve-merges, with a lot of issues fixed such as > the inability to reorder commits with --preserve-merges). > > Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> > --- > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt > @@ -427,9 +427,10 @@ See also REBASING MERGES and INCOMPATIBLE OPTIONS below. > --preserve-merges:: > + [DEPRECATED: use --rebase-merges instead] Recreate merge commits s/--rebase-merges/`&`/ > + instead of flattening the history by replaying commits a merge commit > + introduces. Merge conflict resolutions or manual amendments to merge > + commits are not preserved.
