title: stuck in git rebase and ignored/removed files wont remain ignored
body: <p>Ok first issue:
    I'm not entirely sure how as im rather new to git but I am now stuck with the branch <code>master:REBASE</code>. <strong>EDIT</strong> I was using github's windows client to pull down some changes i had pushed from another pc. Git error-ed saying I had unstaged files and could not complete. I don't have the exact message because I closed the window on accident. I have no idea how to get through this.</p>
  
  <p>Second issue is with untracking files O have <code>git rm --cached &lt;filename&gt;</code> literally 5 times and these three file just keep coming back. I have made sure to add the entire directory to my .gitignore and these are the only three i have problems with.</p>
  
  <p><strong>EDIT</strong><br>
  .gitignore contents  </p>
  
  <pre><code>#################  
  ## Eclipse
  #################
  
      *.pydevproject
      .project
      .metadata
      bin/
      tmp/
      *.tmp
      *.bak
      *.swp
      *~.nib
      local.properties
      .classpath
      .settings/
      .loadpath
  
      # External tool builders
      .externalToolBuilders/
  
      # Locally stored "Eclipse launch configurations"
      *.launch
  
      # CDT-specific
      .cproject
  
      # PDT-specific
      .buildpath
  
  
  ############
  ## Windows 
  ############
  
      # Windows image file caches
      Thumbs.db
  
      # Folder config file
      Desktop.ini
  
  #########
  #archives
  #########
      *.zip
  
  ##############
  #OOE Specifics
  ##############
  #Generated files and directories
  /txt
  /signed 
  /unsigned
  /hi7
  logindetails.csv
  /timer/
  config.php
  </code></pre>
  
  <p>example of file to be ignored/removed:</p>
  
  <pre><code>timer/jquery.timeentry-zh-CN.js  
  timer/jquery.timeentry-pl.js  
  timer/jquery.timeentry-ru.js
  timer/jquery.timeentry-hu.js
  </code></pre>
  
  <p>also i want to keep these files in the working directory i just dont want to have them being tracked.</p>
  
  <p>If any more info or clarification is needed please let me know.</p>