From: Eric Sunshine <sunshine@sunshineco.com>
Date: Thu, 07 Mar 2019 16:47:52 GMT
Subject: Re: [PATCH 1/1] rebase: deprecate --preserve-merges
Message-ID: <CAPig+cSTtn6ON3rMeno+0ikOER6gq2bF=ktC-ehcaCo1pMd3MQ@mail.gmail.com>
In-Reply-To: <6407430da7f75cb2385d243c9820ac8c2ea7fee3.1551952855.git.gitgitgadget@gmail.com>

On Thu, Mar 7, 2019 at 6:11 AM Johannes Schindelin via GitGitGadget
<gitgitgadget@gmail.com> 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@gmx.de>
> ---
> 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.