title: How to merge remote master to local branch
body: <p>I have a local branch of a project ("configUpdate") that I've forked from somebody else's project and I've done a load of changes on it and would like to merge the changes they've made in to my local branch.</p>
  
  <p>I've tried </p>
  
  <pre><code>git pull --rebase origin configUpdate
  </code></pre>
  
  <p>but it hasn't grabbed the latest changes - how can I merge the two?  (also for bonus points what did I do with the <code>pull --rebase</code> command?)</p>