title: how to recover from stopped pull with rebase
body: <p>I've stopped pull with rebase working on a big project after Intellij Idea warning.</p>
  
  <p>After that, most of the files in the project comes brown and not in the tracked state, but what i have in my filesystem is ok, and i continue working on the project. </p>
  
  <p>i even did some commits after that. </p>
  
  <p>i would add all the files to be tracked, but some of them shouldn't be tracked.</p>
  
  <p>i'm not shure about what to do, so i didn't try anything for now.</p>
  
  <p>i want to find a solution to make it back to adequate state. </p>
  
  <p>how would you do that?</p>