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

git rebase to move a batch of patches onto the current branch

From
Avery Pennarun <apenwarr@gmail.com>
Date
Jul 24, 2008, 19:57 UTC
Message-ID
<32541b130807241257j7820a591if8ca01c66bbcd6b2@mail.gmail.com>
Hi,

I often find myself being on a branch and wanting to do the equivalent of a series of cherry-picks from another branch into the current one. Unfortunately, "git cherry-pick" only does one patch at a time (which is very tedious), and "git rebase", which is much less tedious to use, seems to specializing in applying your current branch on top of another branch, not the other way around.

Currently I do something like this:
      git checkout -b tmp branch_with_interesting_stuff~5
      git rebase --onto mybranch branch_with_interesting_stuff~15
      git branch -d mybranch
      git branch -m tmp mybranch

But it seems a little complex when what I *really* want to type is something like:

      git cherry-pick
branch_with_interesting_stuff~15..branch_with_interesting_stuff~5

and have it give me a rebase-style UI in case of conflicts, etc. And of course, even more bonus points if I can get "rebase -i" functionality.

Am I missing an obvious syntax option here or is this not something normal people want to do?

I see that the second option to rebase sounds almost right:
       If <branch> is specified, git-rebase will perform an automatic git
       checkout <branch> before doing anything else. Otherwise it remains
       on the current branch.
So I could perhaps do this:
       git rebase --onto mybranch branch_with_interesting_stuff~15 \
              branch_with_interesting_stuff

But it sounds like that would rewrite branch_with_interesting_stuff instead of mybranch.

Thanks,
Avery
Next: Alex Riesen
Message 1 of 9 in “git rebase to move a batch of patches onto the current branch”
  1. Avery PennarunJul 24, 2008
  2. Alex RiesenJul 24, 2008
  3. Avery PennarunJul 24, 2008
  4. Alex RiesenJul 24, 2008
  5. Avery PennarunJul 24, 2008
  6. Daniel BarkalowJul 25, 2008
  7. Stephan BeyerJul 25, 2008
  8. Alex RiesenJul 25, 2008
  9. Björn SteinbrinkJul 25, 2008

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.