title: Git Rebase: Adding files after directory structure changed
body: <p>I have the following scenario:</p>
  
  <p>I have Repo1 and I created a copy of it in Repo2, by cloning Repo1 and then changing the origin to Repo2. So far so good. No in Repo 2 I want to create a src folder and move all the files into it, such that we have the following situation:</p>
  
  <p>Repo1:</p>
  
  <pre><code>- file1
  - folder1
    -file2
  </code></pre>
  
  <p>Repo2:</p>
  
  <pre><code>-src
    - file1
    - folder1
      -file2
  </code></pre>
  
  <p>So far so good. No when I <strong>rebase Repo2 onto Repo1</strong>, and file1 has changed, it detects this and adds the changes to the correct file1 inside the src folder of Repo2.</p>
  
  <p><strong>The problem is when I add a file in Repo1 and then rebase it does not detect this and puts the new file outside the src folder.</strong></p>
  
  <p>Any tips on how this could be solved such that smooth rebasing will be possible?</p>
  
  <p>Thanks a lot!</p>