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

Rebasing merge commits

From
RDRobert Dailey <rcdailey.lists@gmail.com>
Date
Mar 18, 2014, 18:11 UTC
Message-ID
<CAHd499BFAmfDAjNr0RhCiy4vEBn2xJzCtTmwrB-U51qJryB+Dw@mail.gmail.com>

What's the general recommendation on rebasing after creating a merge commit on my branch? I realize rebase has the -p option but it seems like it does a lot of complicated stuff, and it discourages interactive rebase with the option.

My situation is simple: I have a topic1 branch that has a few commits on it. During my work, I notice someone else implements a small bug fix that I need. I do a `git merge --no-ff` to force that into my branch as a separate merge commit. After that, I continue my work on my local topic1 branch as usual. When I want latest from master, I do `git rebase master`. However now that I have a merge commit on my branch, things get complicated.

What's a good workflow for this, since it seems pretty common?
Next: Max Kirillov
Message 1 of 2 in “Rebasing merge commits”
  1. Robert DaileyMar 18, 2014
  2. Max KirillovMar 19, 2014

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.