title: Git pull doesn't pull down recent commit
body: <p>I have a Git repo on BitBucket. I have two branches <code>master</code> and <code>db</code>. On my laptop I made changes to <code>db</code>, commited the changes and pushed up to BitBucket. I can see the commit in that branch.</p>
  
  <p>Now I'm at my desktop at work and I've done a <code>git pull</code> whilst on branch master. It's pulled down master's commits but not db, which I guess might be the way it should work. I want to get the latest commits on db so I switch to that branch and do <code>git pull</code> however I get the following message:</p>
  
  <blockquote>
    <p>You asked me to pull without telling me which branch you want to merge
    with...</p>
  </blockquote>
  
  <p>I'm not really sure why this is happening. I created that branch on this machine so should it not just pull down the commits into that branch?</p>
  
  <p><strong>OUTOUT FROM git branch -vva</strong></p>
  
  <pre><code>$ git branch -vva
    analytics             cea39b9 updated analytics code
  * db                    6091b29 minor change to the tag creation code
    master                0a4070c [origin/master] Merge branch 'master' of https:/
  /bitbucket.org/billyjones/findr.fm
    remotes/origin/db     faf9970 Got tracks working. Now trying to cache prices.
    remotes/origin/master 0a4070c Merge branch 'master' of https://bitbucket.org/b
  illyjones/findr.fm
  </code></pre>
  
  <p>It's the faf9970 commit I need to pull</p>