I'm pretty new to Git, and like it a lot so far, but am not sure what do do here.
I've forked a github project, and am currently in the process of porting it to another language. For reference, I've created a branch of the code as it was when I made the fork. My problem now is that the original project has been updated, and I can't figure out how to pull those changes into my branch from the original master (because 'origin' points to my github project).
Follow-up question for my own education, what command will the owner of the original project have to run in order to pull a change in from my branch into his master branch?