Re: help with git/github

 On Sat, 24 Dec 2011 10:03:04 +1300, Phillip Hutchings wrote:
> You don't want to rebase, trust me.
>
> If I understand your remote has just change the branch names, so
> where before you merged from origin/master you now want to merge from
> origin/3.0? In the command line land this would be called changing 
> the
> remote tracking.
>
> I've never seen an option to do this on github, but you can always
> specify any merge branch you like on the command line. Git's remote
> tracking feature (which is what GitHub is exposing here) is just a
> convenience so you don't have to type it all the time.
>
> So get a local clone of your repo, add a remote pointing to the
> original repo, then you can just git fetch; git merge upstream/3.0;
> git push origin, or you could use gitk master upstream/3.0 to get a
> graphical representation.

 that's the one, cheers. it took a bit of working out, but i got there 
 in the end. yes, rebase is completely different, it wouldn't have helped 
 i realise now. i'll have to do some more research into gitk, i'm not 
 quite sure what the graphical representation there means

> This may make the network queue on github break, but it'll work fine.

 no, that's ok. i can examine the commits using git on the command line

 thanks for the assistance

-- 
 robin

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

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