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

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

From
Alex Riesen <raa.lkml@gmail.com>
Date
Jul 25, 2008, 20:00 UTC
Message-ID
<20080725200049.GA6611@blimp.local>
In-Reply-To
<20080725192500.GB13539@leksak.fem-net>
Stephan Beyer, Fri, Jul 25, 2008 21:25:00 +0200:
Show 36 quoted lines
> Daniel Barkalow wrote:
> > > On 7/24/08, Alex Riesen <raa.lkml@gmail.com> wrote:
> > > > Avery Pennarun, Thu, Jul 24, 2008 22:16:06 +0200:
> > > > > On 7/24/08, Alex Riesen <raa.lkml@gmail.com> wrote:
> > > >
> > > > > >     gcp3 ()
> > > >  > >     {
> > > >  > >         git format-patch -k --stdout --full-index "$@" | git am -k -3 --binary
> > > >  > >     }
> > > >  >
> > > >  > But that'll give up when there are conflicts, right?  git-rebase lets
> > > >  > me fix them in a nice way.
> > > >
> > > > No, it same as in rebase. You'll fix them and do "git am --resolved".
> > > >  See manpage of git am.
> > > 
> > > Hmm, cool.
> > > 
> > > So that command isn't too easy to come upon by accident.  If I wanted
> > > to submit a patch to make this process a bit more obvious, would it
> > > make sense to simply have git-cherry-pick call that sequence when you
> > > give it more than one commit?
> > 
> > Before terribly long, we'll have "git sequencer", which should be easy to 
> > get to do the "rebase -i" thing with cherry-pick-style usage (somebody 
> > would just need to write code to generate the correct series of pick 
> > statements).
> 
> For simple cases this code could be something like:
> git rev-list --reverse --cherry-pick --no-merges --first-parent <from>..<to> |
> 	sed 's/^/pick /' | git sequencer
> 
> (At least this is what I use relatively often.)
> 
> But as long as git sequencer is not in official git, this is not an
> option. :)

Besides, that's longer than format-patch + am for the same from..to range.

Previous: Stephan BeyerNext: Björn Steinbrink
Message 8 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.