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

Re: Possible issue with rebase's --rebase-merges option

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Aug 10, 2020, 14:46 UTC
Message-ID
<nycvar.QRO.7.76.6.2008101645410.50@tvgsbejvaqbjf.bet>
In-Reply-To
<CAK1xKQppM3oseB=vdXbDbPjDeFxd9kd0jULcaC=ASkMsKiDCmQ@mail.gmail.com>
Hi Joel,
On Thu, 23 Jul 2020, Joel Marshall wrote:
Show 16 quoted lines
> I saved the state of the repo in a copy so I could come back to it if
> additional examples were needed but I had to clean up my live copy so
> I could get back to work. I'll get you some additional screenshots in
> the next few days. In the meantime, I'll try to give you some context
> around what I'm doing here. The parent branch is my main dev branch
> which consists of a series of clean branches and merges- the dev
> branch basically looks like what you're seeing in the
> --preserve-merges screenshot. I've also got a long running feature
> branch that branches off of dev, and it also consists of many branches
> and merges, each a subtask of the story related to the feature branch
> as a whole. Occasionally to get the feature branch up to date with the
> newest features I'll rebase the whole thing on top of dev, which
> should result in an unbroken chain of branches and merges as seen in
> the --preserve-merges screenshot. While you can't see it in the
> --rebase-merges screenshot, those merges show no ancestors when viewed
> in reverse chronological order- they just trail off into oblivion.

I could imagine that you might want to try this rebase with `--rebase-merges=rebase-cousins`.

Otherwise, you might want to export your use case with `git fast-export --anonymize` so that others (such as myself) have a chance of helping you.

Ciao, Johannes

Previous: Joel MarshallNext: Joel Marshall
Message 6 of 10 in “Possible issue with rebase's --rebase-merges option”
  1. Joel MarshallJul 21, 2020
  2. Phillip WoodJul 22, 2020
  3. Joel MarshallJul 22, 2020
  4. Phillip WoodJul 22, 2020
  5. Joel MarshallJul 23, 2020
  6. Johannes SchindelinAug 10, 2020
  7. Joel MarshallDec 8, 2021
  8. Joel MarshallMar 22, 2022
  9. Johannes SchindelinMar 24, 2022
  10. Philip OakleyMar 28, 2022

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.