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

Can't get git rebase --onto to work

From
Howard Miller <howard@e-learndesign.co.uk>
Date
Jun 2, 2011, 10:17 UTC
Message-ID
<BANLkTikF7p_XsU6YJ81bq10S3nL6tBsApg@mail.gmail.com>
Trying to explain this as concisely as possible.
I started with the following branches (names changed to protect the guilty)...
* clientA
* clientB
both have a common ancestry....

I then checked out clientB created a new branch clientB_patch and did a load of work and commits.

However, I actually wanted all those commits to apply to clientA branch instead so....

git checkout clientA git checkout -b clientA_patch (to ensure I didn't wreck original branch) git rebase --onto clientA_patch clientB clientB_patch

It says "rewinding" head and then applies the commits I would have expected.

However, I have now been switched to the 'clientB_patch' branch and it says that it differs from its tracked remote branch by hundreds of commits.

clientA_patch is unchanged. It seems to have mangled clientB_patch and done nothing to clientA_patch. Where did I go wrong?

TIA
Next: Carlos Martín Nieto
Message 1 of 10 in “Can't get git rebase --onto to work”
  1. Howard MillerJun 2, 2011
  2. Carlos Martín NietoJun 2, 2011
  3. Howard MillerJun 2, 2011
  4. Tim GuirgiesJun 2, 2011
  5. Howard MillerJun 2, 2011
  6. Tim GuirgiesJun 2, 2011
  7. Howard MillerJun 2, 2011
  8. DavidJun 2, 2011
  9. Tim GuirgiesJun 2, 2011
  10. Howard MillerJun 2, 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.