如何让git永久忽略文件中的更改?

你需要一个 smudge/clean process gitattribute filter driver ,描述 in ProGit

每次更新工作目录时,都有机会替换工作目录的内容 .htaccess 使用一个预定义的,适合您当前的环境。

只需告诉git假定文件没有更改:

$ git update-index --assume-unchanged FILE [FILE ...]

   --assume-unchanged, --no-assume-unchanged
       When these flags are specified, the object names recorded for the paths are not updated. Instead, these options set and unset the "assume unchanged" bit for the paths. When the "assume unchanged" bit is on, git stops checking the
       working tree files for possible modifications, so you need to manually unset the bit to tell git when you change the working tree file. This is sometimes helpful when working with a big project on a filesystem that has very slow
       lstat(2) system call (e.g. cifs).

       This option can be also used as a coarse file-level mechanism to ignore uncommitted changes in tracked files (akin to what .gitignore does for untracked files). Git will fail (gracefully) in case it needs to modify this file in the
       index e.g. when merging in a commit; thus, in case the assumed-untracked file is changed upstream, you will need to handle the situation manually.

发现于 How to Ignore Changes in Tracked Files With Git

基于部署的方法:使用工具(如capistrano/cfengine/…)自动化部署过程。这有很多优点,其中之一就是能够将配置与代码分开。