title: git - setting a commit's parent without rebase
body: <p>I used <code>git-svn</code> to create a git mirror of an SVN repository. The structure inside the SVN was a little  off-standard, so git created a branch that has no common commit with the <code>master</code> branch.</p>
  
  <pre><code>      A---B---C topic
  
  D---E---F---G master
  </code></pre>
  
  <p>I know that commit <code>A</code> is based off commit <code>E</code> and I'm pretty positive that I've fixed the issues causing git not to recognize that fact (using <code>filter-branch</code>). What I want to do is re-attach <code>topic</code> to the <code>master</code> branch, setting <code>E</code> as the parent of <code>A</code>:</p>
  
  <pre><code>      A---B---C topic
       /
  D---E---F---G master
  </code></pre>
  
  <p><code>git-rebase</code> doesn't seem to work for me because the diff for commit <code>A</code> lists the creation of a whole lot of files that already exist in <code>master</code>, resulting in a huge number of conflicts.<br>
  From my understanding of git just setting <code>E</code> as the parent of <code>A</code> should be enough to solve all problems.<br>
  Is this possible? If it is, how can I do it?</p>