title: Am I doing it wrong? Merging SVN changes from trunk into a git branch. Using merge --squash
body: <p>We use branches to do our work and keep trunk pristine for the most part. Before merging my changes from my branch into trunk, I want to make sure that I've got the latest changes from svn/trunk into my local branch. It's taken me a bit to figure it out but here's the workflow I've come up with, and I'd like to know if there's a better way of doing it.
  (In this example I'm the only one on this branch, so there's no need to git svn rebase for changes to this branch)</p>
  
  <pre>
  git svn fetch
  git co -b feature_branch svn/kastner/feature_branch
  ....work....commit...work...commit
  git svn fetch
  git merge svn/trunk --squash
  git commit -m 'forward merge of svn/trunk'
  git svn dcommit
  </pre>
  
  <p>The reasons I'm doing it this way:</p>
  
  <ul>
  <li>git merge without squash will add a git-svn-id pointing to trunk, so dcommit would push there</li>
  <li>rebasing to svn/trunk would take this branch totally off the tracks</li>
  </ul>