How do I .gitignore and delete an already committed file without affecting other working copies?

git file gitignore delete-file
Benjamin Buch picture Benjamin Buch · Sep 30, 2010 · Viewed 7.6k times · Source

I have a bare repository and two working copies - one on my machine, the other on the server.
It turned out that I have to .gitignore a certain file that has to be specific for every machine. Let's call it 'settings.py'. This file is already committed.

I did put 'settings.py' in .gitignore to ignore it. When I now change the file on my machine git status still tells me 

modified:  settings.py

I figured out that I have to remove settings.py like this:

git rm --cached settings.py

Then git add ., followed by git commit.

But when I now push this to the bare repo and pull it to the working copy on the server, settings.py is deleted there - which is bad because I have to keep this specific settings.py.

I figured that I just could make a copy of settings.py and put it back in once it is deleted, but I feel like there has to be a better way of doing this.

Answer

Outspaced picture Outspaced · Oct 20, 2010

You can tell git to completely ignore changes to tracked files without having to remove them. Use this command:

git update-index --assume-unchanged [FILENAME]

Then if you want to track the file later:

git update-index --no-assume-unchanged [FILENAME]

Related questions

How to .gitignore all files/folder in a folder, but not the folder itself?

Possible Duplicate: How do I add an empty directory to a git repository I want to check in a blank folder. How can I do this?

Read More
Download a single folder or directory from a GitHub repo

How can I download only a specific folder or directory from a remote Git repo hosted on GitHub? Say the example GitHub repo lives here: [email protected]:foobar/Test.git Its directory structure: Test/ ├── foo/ │ ├── a.py │ └── b.py └── …

Read More
Undo working copy modifications of one file in Git?

After the last commit, I modified a bunch of files in my working copy, but I want to undo the changes to one of those files, as in reset it to the same state as the most recent commit. However, …

Read More