title: git-svn: Keep single merge commit after svn rebase
body: <p>I am following this pattern to check in my code in feature-branch to Subversion with git-svn:</p>
  
  <pre>git checkout master
  git svn rebase
  git checkout feature-branch
  git rebase master
  git checkout master
  git merge --no-ff feature-branch
  git commit --amend
  git svn dcommit</pre>
  
  <p>(master is my remote Subversion tracking branch)</p>
  
  <p>This creates a single merge commit on master (regardless of how many git commits I have done on feature-branch) which I can check into Subversion.</p>
  
  <p>However, someone checks code into Subversion after I merge feature-branch into master, when I execute the command <code>git svn rebase</code> the new changes are applied and each individual commit from feature-branch is applied on top.  At this point I no longer have a single merge commit but every commit that I performed on feature-branch in master.</p>
  
  <p>What is the best way to deal with this?</p>