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

Re: Feature request: --preserve-merges to add "exec git merge ..." instead of "pick ..."

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 7, 2019, 16:42 UTC
Message-ID
<xmqq36q4berk.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<CAH0Uv3Eu7bGSVaJKu6kDjp0BPRe0yROucDfJ8QHV3X_ZjNJT7g@mail.gmail.com>
Andreas Hennings <andreas@dqxtech.net> writes:
Show 5 quoted lines
> This means we need a rebase operation where:
> - The commits of the acceptance branch itself are being replaced.
> - The commits of the feature branches remain as they are.
>
> A "git rebase --preserve-merges" almost does this, but not really.

This wished-for feature sounds to me more like the "first-parent" mode that has been discussed a few times in the past but never materialized.

The preserve-merges mode is getting abandoned by the original author as unsalvageable. Have you tried the rebase-merges mode? That may let you choose replaying only the merge commits on the acceptance branch without touching the tips of the feature branches getting merged.

Previous: Andreas HenningsNext: Andreas Hennings
Message 2 of 5 in “Feature request: --preserve-merges to add "exec git merge ..." instead of "pick ..."”
  1. Andreas HenningsJan 7, 2019
  2. Junio C HamanoJan 7, 2019
  3. Andreas HenningsJan 7, 2019
  4. Andreas HenningsJan 8, 2019
  5. Junio C HamanoJan 8, 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.