Hi Viet, On 20/11/2017 10:52, Viet Nguyen wrote: > Currently, a file can be either tracked or untracked. So, I propose we > add a feature to stop tracking files while keeping them in the index. > > Example scenario: > - A developer would like to add some configuration files with example > values, e.g. DB_PASSWORD=changeme. But in the future he also want to > update those files and to notify the others with conflicts. If I`m understanding you correctly, what you want should already be possible through `git update-index --[no-]skip-worktree`[1]. Regards, Buga [1] https://git-scm.com/docs/git-update-index#git-update-index---no-skip-worktree