On 7/24/08, Alex Riesen <raa.lkml@xxxxxxxxx> wrote:
> Avery Pennarun, Thu, Jul 24, 2008 21:57:03 +0200:
>
> > 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
--
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
