[Scummvm-devel] Towards a new release branch model
Tarek Soliman
tarek-spam at zeusmail.bounceme.net
Wed Jun 1 19:50:51 CEST 2011
On Wed, Jun 01, 2011 at 10:48:14AM -0500, Tarek Soliman wrote:
> On Wed, Jun 01, 2011 at 05:26:02PM +0200, Marcus Comstedt wrote:
>
> > Exactly. rebase is a little clunky because it doesn't support the
> > creation of a new branch in the same operation (rebase -b would be
> > sweet), but it's not so hard to work around it.
> Maybe a combination of git cherry and git cherry-pick will give you want you want.
> I just cherry-pick ranges. Not sure what will happen if a commit doesn't exist.
I meant to say "Not sure what will happen if a commit already exists" in that rebase skips it but I don't know what cherry-pick will do.
--
Tarek
More information about the Scummvm-devel
mailing list