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

Re: rebase converts merge commits

From
Sébastien Barthélemy <barthelemy@crans.org>
Date
Oct 12, 2010, 15:23 UTC
Message-ID
<AANLkTinZzBGtC9q7J=xD1e7c80O4THdP00+mp==8hbQA@mail.gmail.com>
In-Reply-To
<20101012145824.GF22067@login.drsnuggles.stderr.nl>
Hi Matthijs,
2010/10/12 Matthijs Kooijman <matthijs@stdin.nl>:
> Have you tried the --preserve-merges option to rebase?
No, I didn't know about this option. Thank you for the tip.

I just tried, and it does not work either. The merge commit is preserved, but the commit I'm push back in time is lost.

There is a warning against this kind behaviour when using both --interactive and rebase.

Thanks,
-- 
Sebastian
Previous: Matthijs KooijmanNext: Kevin Ballard
Message 3 of 5 in “rebase converts merge commits”
  1. Sébastien BarthélemyOct 12, 2010
  2. Matthijs KooijmanOct 12, 2010
  3. Sébastien BarthélemyOct 12, 2010
  4. Kevin BallardOct 12, 2010
  5. Sébastien BarthélemyOct 17, 2010

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.