title: Track someone's GitHub repo in a branch
body: <p>I'm pretty new to Git, and like it a lot so far, but am not sure what do do here.</p>
  
  <p>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).</p>
  
  <p>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?</p>
  
  <p>EDIT: These answers work when I run them from my own 'master' branch, but not when I run them from my 'tracking' branch (I'm using the term loosely here because I know of a git command of the same name. Not sure what it does, though).</p>
  
  <p>When I'm in my non-master branch, and run <code>git fetch upstream</code>, nothing happens. When I try <code>git fetch upstream:master</code>, it says</p>
  
  <pre><code>ssh: upstream: no address associated with name
  fatal: The remote end hung up unexpectedly
  </code></pre>