Re: real git pull grief

2013-01-15 Thread Jay Vee
git diff shows a list of files that I have made some changes to and the diff for files that I have not changed. The files I have made changes to (config files), I never want to commit or push and sometimes I may want them overwritten. for now I simply want to leave them there (changes to .sql fil

Re: real git pull grief

2013-01-15 Thread Jonathan Nieder
Hi Jay, Jay Vee wrote: > I HAVE NOT CHANGED THIS FILE. It is telling me that my local > changes huh? I have not changed or modified the file. > > > When I do a $git status I see a lot of other files that begin with: > > # modified: > Two questions: * what does "git diff"