I'm having some trouble understanding basic git concepts :/
I'm testing on my local Windows machine before trying some things on my git-controlled site.
I have:
gittesting/repo1:
file.txt
ignoreme:
ignore.txt
and
gittesting/repo2
file.txt
ignoreme:
ignore.txt
Repo2 is a copy of repo1, and ignoreme is already being tracked. The ignore.txt file becomes changed in repo2, but I want to stop tracking it and for git to completely ignore it. The problem is that if I create a .gitignore file and add ignoreme, it's too late because it's already being tracked, so I would have to do git rm --cached ignore, but then it's marked as deleted and if I pulled the commit to repo1, the directory would be deleted instead of being left alone..
To sum it up:
I've looked online, asked in the IRC, and looked at the very related questions, but can't find a way to do this. I know the example seems trivial, but it's exactly what I need to do on my site, where the directory is Forum/cache instead.
edit:
This is a bit of a hack and I'd prefer a better answer, but I ended up doing:
cd repo2
echo "ignoreme" > .gitignore
echo "ignoreme/*" > .gitignore
git rm --cache -r ignoreme
git commit -m "Should ignore now"
cd ../repo1
mv ignoreme ignoreme2
git pull ../repo2
mv ignoreme2 ignoreme
Try this
git update-index --assume-unchanged ignoreme/ignore.txt
Git will ignore any future changes to this file without changing the repository. To start tracking changes again, use
git update-index --no-assume-unchanged ignoreme/ignore.txt
Note that this only takes effect for the current working copy, so you would need to do this each time you clone the repository.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With