Re: .gitignore does not ignore Makefile

2016-09-23 Thread Jakub Narębski
W dniu 22.09.2016 o 20:26, Junio C Hamano napisał: > Kevin Daudt writes: > >> Often people advise tricks like `git update-index --assume-unchanges >> `, but this does not work as expected. It's merely a promise to >> git that this file does not change (and hence, git will not check if >> this fil

Re: .gitignore does not ignore Makefile

2016-09-22 Thread Junio C Hamano
Timur Tabi writes: > So .gitignore only ignores new files, not modified ones? It is determines if an untracked file should be considered by "git add" to add it or ignore it.

Re: .gitignore does not ignore Makefile

2016-09-22 Thread Timur Tabi
Junio C Hamano wrote: It actually is even worse. As the user promised Git that the 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 c

Re: .gitignore does not ignore Makefile

2016-09-22 Thread Junio C Hamano
Kevin Daudt writes: > Often people advise tricks like `git update-index --assume-unchanges > `, but this does not work as expected. It's merely a promise to > git that this file does not change (and hence, git will not check if > this file has changed when doing git status), but command that try

Re: .gitignore does not ignore Makefile

2016-09-22 Thread Kevin Daudt
On Thu, Sep 22, 2016 at 09:19:22AM -0500, Timur Tabi wrote: > I have the following .gitignore file in patch arm/arm64/boot/dts: > > *.dtb > qcom > qcom.orig > > When I do a git status, I see this: > > modified: .gitignore > modified: qcom/Makefile > > All of the other files in arm/a

.gitignore does not ignore Makefile

2016-09-22 Thread Timur Tabi
I have the following .gitignore file in patch arm/arm64/boot/dts: *.dtb qcom qcom.orig When I do a git status, I see this: modified: .gitignore modified: qcom/Makefile All of the other files in arm/arm64/boot/dts/qcom are being ignored, as request. However, the file "Makefile" is n