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

From: Alex Riesen <raa.lkml@gmail.com>
Date: Jul 24, 2008, 20:30 UTC
Message-ID: <20080724203049.GC3760@blimp.local>
In-Reply-To: <32541b130807241316x4f85bcdfw12857be575fb3289@mail.gmail.com>

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

Show 9 quoted lines

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