Junio C Hamano wrote:
It actually is even worse. As the user promised Git that the <file>
will not be modified and will be kept the same as the version in the
index, Git reserves the right to_overwrite_ it with the version in
the index anytime when it is convenient to do so, removing whatever
local change the user had despite the promise to Git. The "abort
saying that the file has changed" is merely various codepaths in the
current implementation trying to be extra nice.
So .gitignore only ignores new files, not modified ones? That seems
odd, but I guess that's the way it's always been and I just haven't
noticed until now.
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
Technologies, Inc. Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.