Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>You want <code>skip-worktree</code>.</p> <p><code>assume-unchanged</code> is designed for cases where it is expensive to check whether a group of files have been modified; when you set the bit, <code>git</code> (of course) assumes the files corresponding to that portion of the index have not been modified in the working copy. So it avoids a mess of <code>stat</code> calls. This bit is lost whenever the file's entry in the index changes (so, when the file is changed upstream).</p> <p><code>skip-worktree</code> is more than that: even where <code>git</code> <em>knows</em> that the file has been modified (or needs to be modified by a <code>reset --hard</code> or the like), it will pretend it has not been, using the version from the index instead. This persists until the index is discarded.</p> <p>There is a good summary of the ramifications of this difference and the typical use cases here: <a href="http://fallengamer.livejournal.com/93321.html" rel="noreferrer">http://fallengamer.livejournal.com/93321.html</a> .</p> <p>From that article:</p> <ul> <li><code>--assume-unchanged</code> assumes that a developer <strong>shouldn’t</strong> change a file. This flag is meant for <strong>improving performance</strong> for not-changing folders like SDKs. </li> <li><code>--skip-worktree</code> is useful when you instruct git not to touch a specific file ever because developers <strong>should</strong> change it. For example, if the main repository upstream hosts some production-ready <strong>configuration files</strong> and you don’t want to accidentally commit changes to those files, <code>--skip-worktree</code> is exactly what you want.</li> </ul>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    3. VO
      singulars
      1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload