title: Merge changes from one repo to another with different tree structures
body: <p>I have two Git repos, foo/master and bar/master:</p>
  
  <p>In foo:</p>
  
  <pre><code>code_root
  -&gt;dirA
    -&gt;dirB
      -&gt; *some files*
  </code></pre>
  
  <p>In bar:</p>
  
  <pre><code>code_root
    -&gt; *same files as above*
  </code></pre>
  
  <p>Now someone has made changes to <code>*some files*</code>... how do I get those changes merged into <code>*same files as above*</code>?</p>
  
  <p>When I say "merged" I mean I need the history (commit messages, log hashes etc.) of the deltas to come over as well.</p>