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 8, 2019, 18:38 UTC
Message-ID
<xmqqd0p7571y.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<CAH0Uv3F4q0oPG2O58eTV5n+5eZcxHK9acGMX+4F4LTm1JATfhg@mail.gmail.com>
Andreas Hennings <andreas@dqxtech.net> writes:
> I tried this option after upgrading my git.
> Unfortunately, no matter which variation I use, it still attempts to
> rebase most or all of the feature branches before merging them.
> Possibly depending on their ancestry.

Yes, I know that. But what I am hoping is that it won't actually touch the commits on the side branches UNLESS you tell in the insn sequence to modify them with "edit", "reword", etc. and instead fast-forward them.

Of course, it will allow you to muck with these commits on the side branches, which is a potential source of mistakes.

Previous: Andreas Hennings
Message 5 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.