title: What's the best way to transfer a GIT-SVN debug->feature branch to trunk?
body: <p>I've got a trunk setup where all my production code goes.</p>
  
  <p>Then I have a <code>debug</code> branch (parent is <code>trunk</code>) which I add debugging code such as logging, var dumps, etc... this should never be in production. This branch rarely changes.</p>
  
  <p>Lastly I have a <code>feature</code> branch (parent is <code>debug</code>) where I do all my coding with the benefits of debugging. There are constant commits to this branch.</p>
  
  <p>I just want to know if there is an easier way to move my <code>feature</code> code to the <code>trunk</code>. This is what I currently do:</p>
  
  <ol>
  <li>Commit all changes to my <code>feature</code> branch</li>
  <li>Switch to <code>master</code> and <code>git svn rebase</code> changes from other devs.</li>
  <li><code>rebase</code> my <code>feature</code> branch onto the <code>master</code> branch (<code>git rebase --onto master debug feature</code>)</li>
  <li><code>merge</code> feature to <code>master</code></li>
  <li><code>git svn dcommit</code> changes to other devs</li>
  <li><code>rebase</code> <code>debug</code> to <code>master</code> (<code>git rebase master debug</code>)</li>
  <li>delete <code>feature</code> branch</li>
  <li>create a new <code>feature</code> from the <code>debug</code> branch.</li>
  </ol>