title: git-svn: reset tracking for master
body: <p>I'm using <code>git-svn</code> to work with an SVN repository. My working copies have been created using <code>git svn clone -s http://foo.bar/myproject</code> so that my working copy follows the default directory scheme for SVN (trunk, tags, branches).</p>
  
  <p>Recently I've been working on a branch which was created using <code>git-svn branch myremotebranch</code> and checked-out using <code>git checkout --track -b mybranch myremotebranch</code>. I needed to work from multiple locations, so from the branch I <code>git-svn dcommit</code>-ed  files to the SVN repository quite regularly.</p>
  
  <p>After finishing my changes, I switched back to the master and executed a merge, committed the merge, and tried to dcommit the successful merge to the remote trunk.</p>
  
  <p>It seems as though after the merge the remote tracking for the master has switched to the branch I was working on:</p>
  
  <pre><code># git checkout master
  # git merge mybranch
  ... (successful)
  # git add .
  # git commit -m '...'
  # git svn dcommit
  Committing to http://foo.bar/myproject/branches/myremotebranch ...
  #
  </code></pre>
  
  <p><strong>Is there a way I can update the master so that it's following <code>remotes/trunk</code> as before the merge?</strong></p>
  
  <p>I'm using git 1.7.0.5, if that's any help.</p>
  
  <p>It would be useful if you could also explain <em>why</em> this happened, so I can avoid the problem happening again. Thanks!</p>
  
  <p><strong>Edit:</strong></p>
  
  <p>Here is my current <code>.git/config</code>:</p>
  
  <pre><code>[core]
      repositoryformatversion = 0
      filemode = true
      bare = false
      logallrefupdates = true
      autocrlf = false
  [svn-remote "svn"]
      url = http://foo.bar/myproject
      fetch = trunk:refs/remotes/trunk
      branches = branches/*:refs/remotes/*
      tags = tags/*:refs/remotes/tags/*
  [branch "mybranch"]
      remote = .
      merge = refs/remotes/myremotebranch
  </code></pre>
  
  <p>So it seems that the trunk is pointing to the correct place. However, switching to the branch then back to the master doesn't help; <code>git svn dcommit</code> in the master still tries to push to <code>myremotebranch</code>.</p>