I had a bunch of files in the directory in git that weren't tracked. I made the mistake of doing
git add .
git reset --hard
git reset <FILE>
$ git commit -m "Something terribly misguided" (1) $ git reset HEAD~ (2) << edit files as necessary >> (3) $ git add ... (4) $ git commit -c ORIG_HEAD