Remove files from master at github

Question

First time playing with git, and I accidentally added all hidden files with my commit. Now that I have set up my .gitignore, and committed my changes, all the files ending with "~" are still there.

How do I commit my local files, and remove those from master that are not supposed to be there any more?

Solution

Use git rm --cached FILENAME to delete it from the repository but keep the file physically and git add FILENAME to add a file to your repository. You will need to commit both of these changes with git commit

Comments

[Admin]

I didn't know about the --cached flag. +1 for that. :)

[danielsvane]

Is there any way to remove all untracked/ignored files, so I don't have to manually do this? Gedit creates a hidden file for everything it has opened apparently.

[QuantumBlack]

Are the files spread all over your directory structure? If not, use some GUI utilities like tortoisegit to easily do that.

[QuantumBlack]

windows search to list all your "~" files + tortoisegit = win