No problem at all, I'm noob too :D On Wed, Nov 10, 2010 at 12:59 AM, Ryan Gardner <[email protected]> wrote:
> Yeah, sorry for that mess... if it isn't obvious already I'm kind of a git > noob :/ > > Ryan > On Nov 9, 2010 4:38 PM, "Marvin Froeder" <[email protected]> wrote: > > Yeah, I went cherry-pick road, was trying to avoid that, but I gave up. > > > > VELO > > > > On Tue, Nov 9, 2010 at 9:20 PM, Julien Nicoulaud < > [email protected] > >> wrote: > > > >> Oh yes, I looked at this page and did not scroll enough: > >> https://github.com/ryangardner/flexmojos/commits/ > >> Scary reverts :) > >> > >> cherry-pick is what you need here. This should do it: > >> git remote add ryangardner git://github.com/ryangardner/flexmojos.git > >> git fetch ryangardner > >> git cherry-pick 2eed6885bee6b6e61c65 > >> > >> Then if you want to cherry-pick some other commits from ryangardner's > fork > >> later, you will just have to "fetch ryangardner" and "cherry-pick > <COMMIT>" > >> > >> 2010/11/9 Marvin Froeder <[email protected]> > >> > >>> git pull will include many commit that aren't related to the problem > and > >>> also some commits that do something and after a commit that undo the > >>> original commit, I don't wanna this stuff into flexmojos =/ > >>> > >>> VELO > >>> > >>> > >>> On Tue, Nov 9, 2010 at 8:24 PM, Julien Nicoulaud < > >>> [email protected]> wrote: > >>> > >>>> You can just pull his branch too. This is the most "standard" way to > do > >>>> this, especially at Github: people fork your repository, make some > commits, > >>>> send you a pull request, and if it's ok you pull their branch. > >>>> > >>>> git pull git://github.com/ryangardner/flexmojos.git flexmojos-4.x > >>>> > >>>> If you "cherry-pick", it is just like applying a patch, you have to > think > >>>> about what changed in the meanwhile. > >>>> > >>>> -- Julien > >>>> > >>>> 2010/11/9 Marvin Froeder <[email protected]> > >>>> > >>>>> I saw this *git* cherry-pick > >>>>> But if I understand it will behave the same as if I just copy-paste > this > >>>>> change into my code, is that it? > >>>>> > >>>>> VELO > >>>>> > >>>>> > >>>>> On Tue, Nov 9, 2010 at 6:36 PM, Marvin Froeder <[email protected] > >wrote: > >>>>> > >>>>>> Hey, > >>>>>> > >>>>>> Any of the git educated persons.... how do I merge a single commit > to > >>>>>> my branch? > >>>>>> > >>>>>> I need to merge [1] into [2] > >>>>>> > >>>>>> [1] > >>>>>> > https://github.com/ryangardner/flexmojos/commit/2eed6885bee6b6e61c651beeecce3ac70d7e7047 > >>>>>> [2] https://github.com/Flexmojos/flexmojos/tree/flexmojos-4.x/ > >>>>>> > >>>>>> > >>>>>> VELO > >>>>>> > >>>>> > >>>>> -- > >>>>> You received this message because you are subscribed to the Google > >>>>> Groups "Flex Mojos" group. > >>>>> To post to this group, send email to [email protected] > >>>>> To unsubscribe from this group, send email to > >>>>> [email protected]<flex-mojos%[email protected]> > <flex-mojos%[email protected]<flex-mojos%[email protected]> > > > > >>>>> For more options, visit this group at > >>>>> http://groups.google.com/group/flex-mojos > >>>>> > >>>>> http://flexmojos.sonatype.org/ > >>>>> > >>>> > >>>> -- > >>>> You received this message because you are subscribed to the Google > >>>> Groups "Flex Mojos" group. > >>>> To post to this group, send email to [email protected] > >>>> To unsubscribe from this group, send email to > >>>> [email protected]<flex-mojos%[email protected]> > <flex-mojos%[email protected]<flex-mojos%[email protected]> > > > > >>>> For more options, visit this group at > >>>> http://groups.google.com/group/flex-mojos > >>>> > >>>> http://flexmojos.sonatype.org/ > >>>> > >>> > >>> -- > >>> You received this message because you are subscribed to the Google > >>> Groups "Flex Mojos" group. > >>> To post to this group, send email to [email protected] > >>> To unsubscribe from this group, send email to > >>> [email protected]<flex-mojos%[email protected]> > <flex-mojos%[email protected]<flex-mojos%[email protected]> > > > > >>> For more options, visit this group at > >>> http://groups.google.com/group/flex-mojos > >>> > >>> http://flexmojos.sonatype.org/ > >>> > >> > >> -- > >> You received this message because you are subscribed to the Google > >> Groups "Flex Mojos" group. > >> To post to this group, send email to [email protected] > >> To unsubscribe from this group, send email to > >> [email protected]<flex-mojos%[email protected]> > <flex-mojos%[email protected]<flex-mojos%[email protected]> > > > > >> For more options, visit this group at > >> http://groups.google.com/group/flex-mojos > >> > >> http://flexmojos.sonatype.org/ > >> > > > > -- > > You received this message because you are subscribed to the Google > > Groups "Flex Mojos" group. > > To post to this group, send email to [email protected] > > To unsubscribe from this group, send email to > > [email protected]<flex-mojos%[email protected]> > > For more options, visit this group at > > http://groups.google.com/group/flex-mojos > > > > http://flexmojos.sonatype.org/ > > -- > You received this message because you are subscribed to the Google > Groups "Flex Mojos" group. > To post to this group, send email to [email protected] > To unsubscribe from this group, send email to > [email protected]<flex-mojos%[email protected]> > For more options, visit this group at > http://groups.google.com/group/flex-mojos > > http://flexmojos.sonatype.org/ > -- You received this message because you are subscribed to the Google Groups "Flex Mojos" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/flex-mojos http://flexmojos.sonatype.org/
