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

Re: Preserve merge changes with rebase -p

From
AWAndrew Wong <andrew.w@sohovfx.com>
Date
Jun 21, 2011, 14:44 UTC
Message-ID
<4E00AE60.5000801@sohovfx.com>
In-Reply-To
<201106211411.31739.mcy@lm7.fr>
On 06/21/2011 08:11 AM, Matteo Cypriani wrote:
Show 8 quoted lines
> The thing is, my M was not a "simple merge commit", but contained some changes 
> needed for the code in master and topic to work together. In that case, git 
> rebase -i -p recreates a merge commit, but it does not keep the changes 
> introduced in M.
>
> Is there any way to keep the M's changes in my case (except to manually patch 
> & amend the re-created merge commit) ?
>

Unfortunately, I don't think there's any nice way to do it right now. I think what you could do for now is make the "pick <M>" into a "edit <M>", together with other changes you want to make. And then when you get to "edit M", do a "git cherry-pick -n -m 1 <M>", or "-m 2" depending on how your merge was done. That should bring your changes over. Then you just need resolve and add any conflicts, and do a "rebase --continue".

I've only tried it on a simple case and that seems to work.
> If not, maybe it would be a nice functionnality to implement ?
>

I imagine this is pretty useful feature to have too. I could look into adding this support when I got a chance. I haven't given it much thought yet though, so I don't know how feasible it is.

Previous: Matteo CyprianiNext: Matteo Cypriani
Message 2 of 3 in “Preserve merge changes with rebase -p”
  1. Matteo CyprianiJun 21, 2011
  2. Andrew WongJun 21, 2011
  3. Matteo CyprianiJun 21, 2011

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.