Re: git pull not ignoring the file which has been sent to the temporary ignore list

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 23, 2015, 21:14 UTC
Message-ID: <xmqq8ugtqjxg.fsf@gitster.dls.corp.google.com>
In-Reply-To: <CAGZ79kbk=DFcMSVtnWHw7Vn-xm4q4x5T_9qiPrqt5oN1DMhFSw@mail.gmail.com>

Stefan Beller <sbeller@google.com> writes:

>> Ok. How should I then ignore any local changes to the .gitignore
>> file ? And while taking pull, git should skip this file ?
>
> Look at .git/info/exclude

Good answer for ".gitignore". In general, you do not "ignore local changes" to tracked paths.

> I found https://help.github.com/articles/ignoring-files/ as Googles
> first hit, which advises to use
>     git update-index --assume-unchanged path/to/file.txt
> Not sure if that is most helpful advice there.

The piece of advice in the last paragraph on that page is wrong (and it has been wrong from the day it was written).

The gitignore(5) documentation used to have a similar incorrect piece of advice but we finally corrected it recently.

Cf. http://thread.gmane.org/gmane.comp.version-control.git/260954/focus=261118