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

2015-01-24 Thread Kevin
On Sat, Jan 24, 2015 at 10:20:46AM +0630, Arup Rakshit wrote: > On Friday, January 23, 2015 01:14:03 PM you wrote: > > [..] > > There are some configuration files, like `database.yml`, where we > generally put our local DB credentials and we don't want to share such > things. That's why we always

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

2015-01-23 Thread Arup Rakshit
On Friday, January 23, 2015 01:14:03 PM you wrote: > Stefan Beller 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 d

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

2015-01-23 Thread Stefan Beller
On Fri, Jan 23, 2015 at 2:26 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Assuming you want to ignore less than the upstream project (delete some >> lines from .gitignore) it get's tricky in my opinion. > > Why? Doesn't info/exclude allow negative ignore patterns? I used negative patt

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

2015-01-23 Thread Junio C Hamano
Stefan Beller writes: > Assuming you want to ignore less than the upstream project (delete some > lines from .gitignore) it get's tricky in my opinion. Why? Doesn't info/exclude allow negative ignore patterns? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a me

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

2015-01-23 Thread Stefan Beller
On Fri, Jan 23, 2015 at 1:14 PM, Junio C Hamano wrote: > > Good answer for ".gitignore". In general, you do not "ignore local > changes" to tracked paths. > I assumed Arup would want to ignore more than is in the upstream project, so you'd come up with an appendix to the .gitignore file because

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

2015-01-23 Thread Junio C Hamano
Stefan Beller 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://h

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

2015-01-23 Thread Stefan Beller
On Fri, Jan 23, 2015 at 10:35 AM, Arup Rakshit wrote: > On Friday, January 23, 2015 11:31:40 AM you wrote: >> Arup Rakshit writes: >> >> > I asked git not to track any changes to the file .gitignore. To do >> > so I did use the command - git update-index --assume-unchanged >> > .gitignore. >> >>

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

2015-01-23 Thread Arup Rakshit
On Friday, January 23, 2015 11:31:40 AM you wrote: > Arup Rakshit writes: > > > I asked git not to track any changes to the file .gitignore. To do > > so I did use the command - git update-index --assume-unchanged > > .gitignore. > > You are not asking Git to do anything. You promised Git that y

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

2015-01-23 Thread Junio C Hamano
Arup Rakshit writes: > I asked git not to track any changes to the file .gitignore. To do > so I did use the command - git update-index --assume-unchanged > .gitignore. You are not asking Git to do anything. You promised Git that you will make no changes to .gitignore, and then broke that promis

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

2015-01-23 Thread Arup Rakshit
Hi, I asked git not to track any changes to the file .gitignore. To do so I did use the command - git update-index --assume-unchanged .gitignore. [arup@sztukajedzenia]$ git status # On branch MajorUpgrade # Your branch is behind 'origin/MajorUpgrade' by 4 commits, and can be fast-forwarded. #