title: git-svn: how to copy git commits from one SVN branch to another?
body: <p>I've got a git-svn checkout of my entire repo (initialized in the standard <code>git svn init -t tags -b branches -T trunk $repo_url</code> fashion, then <code>git svn fetch</code>ed). I manually <code>svn copy $repo_url/branches/branch1 $repo_url/branches/branch2</code>. I then ran <code>git svn fetch</code>, <code>git checkout -b local-branch2 branch2</code>, made a few commits to <code>branch2</code>, <code>dcommit</code>ed them back to the SVN repo, and am done with my work on <code>branch2</code>. (Why branch a branch? I wanted to  hack at this branch locally in git, but still commit back to SVN and get help from a couple of coworkers while I was working on it).</p>
  
  <p>What I haven't done is merge the <code>branch2</code> work back into <code>branch1</code>. If I <code>git checkout -b local-branch1 branch1</code>, then <code>git merge branch2</code>, it simply fast-forwards my <code>local-branch1</code> pointer to where <code>branch2</code> is.</p>
  
  <p>Instead, I want git to replay all commits made since starting <code>branch2</code> onto branch1, so that I can dcommit each of them to the SVN repo. It seems like there's a way to do this, but I can't think of it. Maybe <code>git rebase</code>, or a <code>git cherry-pick</code> of each commit made on <code>branch2</code>? (though the latter is a bit tedious). I'd rather not svn merge the two URLs together, as that's a big bucket of hurt.</p>
  
  <p>Ideas? Any parts of this need more explanation?</p>