git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/1] git svn: stop using `rebase --preserve-merges`

From
EWEric Wong <e@80x24.org>
Date
Nov 23, 2019, 00:08 UTC
Message-ID
<20191123000828.GA15493@dcvr>
In-Reply-To
<c123d93ae7361b53b9d1d76124aefcb09740f0eb.1574463569.git.gitgitgadget@gmail.com>
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com> wrote:
Show 10 quoted lines
> 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.
Previous: Johannes Schindelin via GitGitGadget
Message 3 of 3 in “git svn: use rebase --rebase-merges instead of preserve-merges”
  1. 0/1 git svn: use rebase --rebase-merges instead of preserve-mergesJohannes Schindelin via GitGitGadget, Nov 22, 2019
  2. 1/1 git svn: stop using `rebase --preserve-merges`Johannes Schindelin via GitGitGadget, Nov 22, 2019
  3. Eric WongNov 23, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.