Re: [PATCH 1/1] rebase: deprecate --preserve-merges

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mar 11, 2019, 19:33 UTC
Message-ID: <nycvar.QRO.7.76.6.1903112032540.41@tvgsbejvaqbjf.bet>
In-Reply-To: <CAPig+cSTtn6ON3rMeno+0ikOER6gq2bF=ktC-ehcaCo1pMd3MQ@mail.gmail.com>

Hi Eric,

On Thu, 7 Mar 2019, Eric Sunshine wrote:

Show 14 quoted lines

> 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/`&`/

Good point!

Thanks, Dscho

Show 5 quoted lines

> 
> > +       instead of flattening the history by replaying commits a merge commit
> > +       introduces. Merge conflict resolutions or manual amendments to merge
> > +       commits are not preserved.
>