从git存储库中删除目录和文件，并添加到忽略列表

Question

I've got a .net solution directory (on OSX using a virtual machine) and just did a

$ git add .
$ git commit

on the whole directory.

I forgot there were a number of file and directories I didn't want added, such as my _resharper directory, and the contents of my bin folder.

So now, how do I first remove those directories and files from my local git repository without deleting them from my working copy?

Additionally, how do I add said directories to an ignore list?

Answer 1

create a .gitignore file in the same directory as the repo. And put

_resharper/
*file.cpp

*remember the slash after the directory name for folder names, no need asterisk

by the way, you will need to remove the folder, untrack and then put it back in if you already add and commited.

You can learn more from here and here

Answer 2

git reflog
git reset @HEAD{x} # x depends on what you see in reflog 
#edit .gitignore
#add line in gitignore 
#_resharper/