title: git-svn and local branches
body: <p>I usually using git for versioning, but right now I am stuck with sources in a svn repository, so I am using git-svn to access that repository. However this seems to lead to some trouble, when I try to use local branches.</p>
  
  <p>I usually only commit my local repositories about once a day, so I might have commits in my local master, that I have not yet send upstream. When I create a branch at this point, and then someone else commits to the upstream repository, all commits between the current one and the last one that was synced upstream get duplicated.</p>
  
  <p>To make this clearer here a short picture:</p>
  
  <pre><code>A-B-C-D-E  
       \  
        \-F
  </code></pre>
  
  <p>The upstream repository is at A and the two branches are at E and F respectively. Doing a git svn rebase leads to:</p>
  
  <pre><code>A-G-H-B-C-D-E
   \
    \-B-C-F
  </code></pre>
  
  <p>Where G and H are the commits that were taken from the upstream repo. I already tried to get the two commits to the other branch as well by switching there and doing another git svn rebase. But this leaves me there:</p>
  
  <pre><code>A-G-H-B-C-D-E
   \
    \-G-H-B-C-F
  </code></pre>
  
  <p>So this leads to even more duplication of commits. Is there a clean way to handle this situation?</p>