title: How to simplifly pull and push? I don't want to type "origin master" anymore
body: <p>Some times, when trying to run <code>$ git pull</code>, git used to say that I needed to be more specific (ie. add "origin master"). So then I found here on stackoverflow that I could run these and forget about it:</p>
  
  <pre><code>$ git config --global branch.master.remote origin
  $ git config --global branch.master.merge refs/heads/master
  </code></pre>
  
  <p>And it works. But now it won't let me push! It says:</p>
  
  <pre><code>fatal: The current branch master has multiple upstream branches, refusing to push.
  </code></pre>
  
  <p>So what should I do if I want to be able to run "git pull" for pulling, and "git push" for pushing? No tricks this time please! ;)</p>