忽略对跟踪文件的更改

Question

I want to change a tracked file for development only, but keep the tracked version unchanged.

Most "solutions" for this suggest

git update-index --assume-unchanged

but it's totally useless, because the file will still be changed by checkout or reset. Is there a better solution that survives checkout and reset commands?

Answer 1

Quick Fix

This is what I think you're trying to do, change a file, but ignore it when committing.

git update-index --skip-worktree my-file

Here is a good answer regarding the difference between assume-unchanged and skip-worktree .

Git will still warn if you try to merge changes into my-file . Then you will have to "unskip" the file, merge it and "re-skip" it.

git update-index --no-skip-worktree my-file
# merge here
git update-index --skip-worktree my-file

There can also be problems if you modify the file, then switch to a branch where that file has been changed. You may have to do some fancy "skip/unskip" operations to get around that.

Long Term Fix

In the long term, you probably want to separate your "local" changes into a second file. For example, if the file you want to change is a config file, create a "default" config file that you check into the repository. Then, allow a second "overrides" config file that is optional and put that file in your .gitignore .

Then, in your application, read the default config file and then check if the overrides file exists. If it does, merge that data with the data from the default file.

This example is for a config file, but you can use that technique for other kinds of overrides if needed.

Answer 2

Since in one of your comments you are working directly in the master branch, the real problem to fix is working in master .

You'll want to create a Topic Branch in Git:

git checkout -b some_feature_or_bug_fix master

Then make the necessary changes to the config file, and commit as normal.

The nice thing here is you don't affect files in master . If you need to pull in updated code, just git fetch and git merge origin/master into your topic branch. Then you can deal with upstream changes to the config file as normal Git merges.

Prior to merging your topic branch into master you can do an interactive squash to reduce your commits and merge commits into one nice, clean commit. Or do a git merge --squash to merge your topic branch into master .