Thread (9 messages) flat view 9 messages, 5 authors, 2016-06-15

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

From: Avery Pennarun <hidden>
Date: 2016-06-15 22:45:01

On 7/24/08, Alex Riesen [off-list ref] wrote:
Avery Pennarun, Thu, Jul 24, 2008 21:57:03 +0200:
quoted
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.

Try this:

    $ type gcp3
    gcp3 is a function
    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.

Avery
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help