[clug] Re: Another git question - git-svn stuff

[Alex Osborne]

Alex Satrapa wrote:
> So in ASCII graphics we have:
> 
> 
> A:  FA---FB---FC---FD---FE---FF
> 
> 
> B:  AA
> 
> Where FA and AA are the same version of code, just different git 
> commits. I now want to take the commits FB..FF and play them on top of 
> AA. 

I'd export them as patches and then apply them to the other tree to 
avoid confusing git with common but not really common ancestry. 
Something like this should do the trick:

   cd A/
   git-format-patch FA

It should spit out a .patch file for each commit since FA.  Then just 
apply them to B:

   cd ../B/
   git-am ../A/*.patch

Cheers,

Alex