title: git: Why "Merge branch 'master' of ... "? when pull and push
body: <p>I'm still git newbie. I modified some source files and committed. Then, I did <code>git push</code>. But, I got this error.</p>
  
  <pre><code>To /foo/bar/  ! [rejected]        master -&gt; master (non-fast-forward)
  error: failed to push some refs to '/foo/bar/' To prevent you from
  losing history, non-fast-forward updates were rejected Merge the
  remote changes before pushing again.  See the 'Note about
  fast-forwards' section of 'git push --help' for details.
  </code></pre>
  
  <p>This reject seems that I didn't <code>git pull</code> before <code>push</code>. So, I did <code>git pull</code>. Okay, there were two modified files by others.</p>
  
  <p>Then, I was able to  <code>git push</code> successfully.</p>
  
  <p><strong>Question:</strong> In this case, I'm seeing one more log like following with my original commit message:</p>
  
  <pre><code>commit 59e04ce13b8afa...
  Merge: 64240ba 76008a5
  Author: Jone Doe &lt;jone@doe.com&gt;
  Date:   Fri Mar 15 11:08:55 2013 -0700
  
      Merge branch 'master' of /foo/bar/
  </code></pre>
  
  <p>And this is my original commit message.</p>
  
  <pre><code>commit 64240bafb07705c...
  Author: Jone Doe &lt;jone@doe.com&gt;
  Date:   Fri Mar 15 11:06:18 2013 -0700
  
      Fixed bugs and updated!
  </code></pre>
  
  <p>I'd like to understand why "merge branch master of location" is added.</p>