git update-index --assume-unchanged and git reset

git reset
Ken Hirakawa picture Ken Hirakawa · May 24, 2011 · Viewed 11.8k times · Source

Here is the scenario:

In my working directory, I have a number of files (let's call them A,B,C) that I've edited. I then ran git update-index --assume-unchanged on those files. Now git status returns blank. Good.

Now, if I do a git reset --hard, the contents of the files A,B, and C, revert back to the contents before I've edited them and "assume-unchanged" them.

Is there a way to stop git from actually reverting files A,B, and C, and simply ignore them?

Thanks,

Ken

Answer

manojlds picture manojlds · May 24, 2011

You can do:

git update-index --skip-worktree A

Related questions

In plain English, what does "git reset" do?

I have seen interesting posts explaining subtleties about git reset. Unfortunately, the more I read about it, the more it appears that I don't understand it fully. I come from a SVN background and Git is a whole new paradigm. …

Read More
How to git reset --hard a subdirectory?

UPDATE²: With Git 2.23 (August 2019), there's a new command git restore that does this, see the accepted answer. UPDATE: This will work more intuitively as of Git 1.8.3, see my own answer. Imagine the following use case: I want to get rid …

Read More
How to rollback the two previous commits?

Consider this scenario: Developer A does a commit: #n Dev. B does commit #n+1 Dev. A does commit #n+2 and commit #n+3 and then discovers that in his commit #n+2 he introduced a defect. How can dev. A rollback his …

Read More