help with git/github

 i'm working on a project on gthub, which is a fork of another project. 
 recently the parent project has created a 3.0 branch (which is beta), 
 and then added a lot of commits to the master branch, which now contains 
 the 3.5 alpha code

 i want to continue merging (cherry-picking) commits from what is now 
 the '3.0' branch, but when i go to 'network queue' in github (the place 
 from which i have previously done this) in my fork, i am offered all the 
 commits from both the '3.0' and 'master' (i.e. 3.5 alpha) branches. is 
 there any way to limit the offered commits to only those from the '3.0' 
 branch?

 i think github doesn't have the power to do this and it needs to be 
 done via git, but i'm still pretty new to it and not sure where to look. 
 i think it might be the 'rebase' command i need, or possibly 'merge 
 remote-tracking' (thanks to morris for that suggestion), but i'm 
 concerned i will fubar everything and not be able to get back - i can't 
 see what it's actually doing.

 any suggestions?

 cheers,

-- 
 robin

 http://fu.ac.nz - Auckland's Free University

_______________________________________________
NZLUG mailing list [email protected]
http://www.linux.net.nz/cgi-bin/mailman/listinfo/nzlug