Avery Pennarun, Thu, Jul 24, 2008 22:16:06 +0200:
> On 7/24/08, Alex Riesen <raa.lkml@xxxxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
