From: Eric Wong <e@80x24.org>
Date: Sat, 23 Nov 2019 00:08:28 GMT
Subject: Re: [PATCH 1/1] git svn: stop using `rebase --preserve-merges`
Message-ID: <20191123000828.GA15493@dcvr>
In-Reply-To: <c123d93ae7361b53b9d1d76124aefcb09740f0eb.1574463569.git.gitgitgadget@gmail.com>

Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com> wrote:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
> 
> We deprecated `--preserve-merges` in favor of `--rebase-merges`; Let's
> reflect that in `git svn`.
> 
> Note: Even when the user asks for `--preserve-merges`, we now silently
> pass `--rebase-merges` to `git rebase` instead. Technically, this is a
> change of behavior. But practically, `git svn` only ever asks for a
> non-interactive rebase, and `--preserve-merges` and `--rebase-merges`
> are on par with regard to that.

I've never used --preserve-merges or --rebase-merges even with
standalone git; but this seems fine as there's no actual
behavior change...

> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Acked-by: Eric Wong <e@80x24.org>

Thanks.