I have a production git repo that I only pull changes from the main repo into; I never change this repo or do commits/pushes from here. I recently accidentally pushed some u
This allowed me to tell git to ignore a specific file, even though it was already part of a project. All changes I make to it will be ignored:
git update-index --assume-unchanged Localization/el-GR.js
Source: http://codethug.com/2013/09/20/4-ways-to-ignore-files-with-git/
git pull
is equivalent (almost) to git fetch && git merge
. You just have to invoke fetch and than merge only specific files - tutorial.