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

From: Avery Pennarun <apenwarr@gmail.com>
Date: Jul 24, 2008, 20:42 UTC
Message-ID: <32541b130807241342h483169d7we955512879075161@mail.gmail.com>
In-Reply-To: <20080724203049.GC3760@blimp.local>

On 7/24/08, Alex Riesen <raa.lkml@gmail.com> wrote:

Show 13 quoted lines

> 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?

Hmm, I suppose not, since git-am is a shellscript and cherry-pick is currently a builtin, so it would be kind of a step backwards.

Thanks,

Avery