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

On 7/24/08, Alex Riesen [off-list ref] wrote:

Avery Pennarun, Thu, Jul 24, 2008 22:16:06 +0200:

quoted

On 7/24/08, Alex Riesen [off-list ref] wrote:

quoted

quoted

    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