title: Git pull origin <branch> overwrites master?
body: <p>I have a repository on Github, <strong>aav1</strong></p>
  
  <p>On my laptop I have two branches, one called <strong>master</strong> and one called <strong>vs12up</strong>
  The master branch was when the software was Visual Studio 2008, vs12up is converted to Visual Studio 2012.</p>
  
  <p>On my laptop everything seems fine and I pushed the new branch to github, appears correct.</p>
  
  <p>On my desktop I tried to pull the remote branch:</p>
  
  <pre><code>git pull origin vs12up
  </code></pre>
  
  <p>It wrote the changes to my master branch on the desktop, <strong>git log</strong> shows the commits made on the <strong>vs12up</strong> branch, but git branch only shows <strong>master</strong>, which is the current branch.</p>
  
  <p>How can I revert the changes to the <strong>master</strong> branch and pull the <strong>vs12up</strong> branch on my desktop to match the repository on my laptop?</p>